Merge remote-tracking branch 'origin/master' into test2 appcode/140.1729 clion/140.1730
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 15 Jan 2015 12:52:47 +0000 (15:52 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 15 Jan 2015 12:52:47 +0000 (15:52 +0300)

Trivial merge