Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 3 Jul 2015 13:09:44 +0000 (16:09 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 3 Jul 2015 13:09:44 +0000 (16:09 +0300)

Trivial merge