Merge remote branch 'origin/master' cidr/112.277 idea/112.279 pycharm/112.281 rubymine/112.282 storm/112.280
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 28 Dec 2011 20:31:01 +0000 (00:31 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 28 Dec 2011 20:31:01 +0000 (00:31 +0400)

Trivial merge