Merge remote-tracking branch 'origin/master' clion/142.4853
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 14 Sep 2015 15:06:26 +0000 (18:06 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 14 Sep 2015 15:06:26 +0000 (18:06 +0300)

Trivial merge