Merge remote-tracking branch 'origin/master' clion/140.2620
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 20 Feb 2015 11:39:15 +0000 (14:39 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 20 Feb 2015 11:39:15 +0000 (14:39 +0300)

Trivial merge