Merge remote-tracking branch 'origin/master' appcode/142.2008 clion/142.2007
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 26 May 2015 08:44:37 +0000 (10:44 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 26 May 2015 08:44:37 +0000 (10:44 +0200)

Trivial merge