Merge branch origin/master
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 29 Oct 2014 17:05:15 +0000 (20:05 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 29 Oct 2014 17:05:15 +0000 (20:05 +0300)

Trivial merge