Merge remote-tracking branch 'origin/master' clion/140.1858
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Wed, 21 Jan 2015 11:17:02 +0000 (12:17 +0100)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Wed, 21 Jan 2015 11:17:02 +0000 (12:17 +0100)

Trivial merge