Merge branch 'myBranch' of https://github.com/siosio/intellij-community into siosio
authorpeter <peter@jetbrains.com>
Wed, 30 Jan 2013 20:08:24 +0000 (21:08 +0100)
committerpeter <peter@jetbrains.com>
Wed, 30 Jan 2013 20:08:24 +0000 (21:08 +0100)
commit6d24d2a6dfc3a20f96b16b42f9016fb8a6ace678
tree27dc011481ce5514efda456a94d5c19c0529c519
parent4998e4b1b38019c1a16e0307ef58901f98e75ff7
parentcf642747ce65a157a6e3416af395ac390648c472
Merge branch 'myBranch' of https://github.com/siosio/intellij-community into siosio
plugins/groovy/src/META-INF/plugin.xml