Merge branch 'master' into dany/groovy-resolve
authorpeter <peter@jetbrains.com>
Wed, 20 Jan 2016 19:11:44 +0000 (20:11 +0100)
committerpeter <peter@jetbrains.com>
Wed, 20 Jan 2016 19:11:44 +0000 (20:11 +0100)
1  2 
plugins/groovy/src/META-INF/plugin.xml