Merge remote-tracking branch 'origin/master' appcode/140.2458 clion/140.2457
authorSergey Malenkov <sergey.malenkov@jetbrains.com>
Fri, 13 Feb 2015 15:35:29 +0000 (18:35 +0300)
committerSergey Malenkov <sergey.malenkov@jetbrains.com>
Fri, 13 Feb 2015 15:35:29 +0000 (18:35 +0300)

Trivial merge