Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 3 Dec 2014 14:27:43 +0000 (17:27 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 3 Dec 2014 14:27:43 +0000 (17:27 +0300)

Trivial merge