Merge remote-tracking branch 'origin/master' clion/144.372
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 16 Oct 2015 12:01:50 +0000 (14:01 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 16 Oct 2015 12:01:50 +0000 (14:01 +0200)

Trivial merge