Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 17 Dec 2014 10:22:00 +0000 (13:22 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 17 Dec 2014 10:22:00 +0000 (13:22 +0300)
commitd31249b42c89f8df55ce6e129b33ea93034de2a6
tree8432fe23cd4dd07774aa0ae06ca22888bdff3644
parenta36b57f8510a85e5b528f58251c804d140417d5b
parent98522d8495e5d1b410ca42dbe7e21aca1bfb69d0
Merge remote-tracking branch 'origin/master'