Merge remote-tracking branch 'origin/master' appcode/142.987 clion/142.984
authorVladislav.Soroka <Vladislav.Soroka@jetbrains.com>
Wed, 8 Apr 2015 12:32:05 +0000 (15:32 +0300)
committerVladislav.Soroka <Vladislav.Soroka@jetbrains.com>
Wed, 8 Apr 2015 12:32:05 +0000 (15:32 +0300)

Trivial merge