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)
commit539c5da61514cec1046cb6389ea36d9d5af3874b
tree9e4b86f429e7a3422bf8a4b9caf6b8b2449ca77d
parent1daf745954d4eadf3f7e7e3247289164404e2b00
parent305338da64a2726a023bdb796bf3ca22354f0cbd
Merge branch 'master' into dany/groovy-resolve
plugins/groovy/src/META-INF/plugin.xml