Merge remote branch 'origin/master' cidr/112.183 idea/112.180 pycharm/112.182 rubymine/112.181 storm/112.178
authorDmitry Jemerov <yole@jetbrains.com>
Thu, 15 Dec 2011 21:07:17 +0000 (22:07 +0100)
committerDmitry Jemerov <yole@jetbrains.com>
Thu, 15 Dec 2011 21:07:17 +0000 (22:07 +0100)

Trivial merge