Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 29 Jan 2015 09:09:09 +0000 (12:09 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 29 Jan 2015 09:09:09 +0000 (12:09 +0300)

Trivial merge