Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 7 Jan 2015 13:16:19 +0000 (14:16 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 7 Jan 2015 13:16:19 +0000 (14:16 +0100)

Trivial merge