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)
commit7281b73a131723df276bed75de96ffbad112a0f6
treeaf439e6cebdffb7f041280cead9ee647314b31b2
parent6e313506a42325ba7b50cb8bee3c0dbea5e47050
parent857bfd57f67c125172adbcc0c20e3854144bcaa1
Merge branch 'cjfm3' of git://github.com/max-kammerer/intellij-community into pull87