Merge remote-tracking branch 'origin/master' clion/140.2434
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 12 Feb 2015 15:01:51 +0000 (16:01 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 12 Feb 2015 15:01:51 +0000 (16:01 +0100)

Trivial merge