Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 26 Jan 2015 14:00:41 +0000 (17:00 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 26 Jan 2015 14:00:41 +0000 (17:00 +0300)

Trivial merge