Merge branch 'cjfm3' of git://github.com/max-kammerer/intellij-community into pull87
authorDmitry Jemerov <yole@jetbrains.com>
Wed, 28 Aug 2013 18:26:39 +0000 (20:26 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Wed, 28 Aug 2013 18:26:39 +0000 (20:26 +0200)

Trivial merge