Merge remote-tracking branch 'origin/master' into test2
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 27 Nov 2014 12:09:36 +0000 (15:09 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 27 Nov 2014 12:09:36 +0000 (15:09 +0300)

Trivial merge