Merge branch 'origin/master' clion/142.167 pycharm/142.168
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 11 Mar 2015 17:54:16 +0000 (20:54 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 11 Mar 2015 17:54:16 +0000 (20:54 +0300)

Trivial merge