Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 30 Apr 2015 07:55:15 +0000 (09:55 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 30 Apr 2015 07:55:15 +0000 (09:55 +0200)

Trivial merge