Merge branch 'master' into dany/groovy-resolve
authorpeter <peter@jetbrains.com>
Tue, 2 Feb 2016 12:43:34 +0000 (13:43 +0100)
committerpeter <peter@jetbrains.com>
Tue, 2 Feb 2016 12:43:34 +0000 (13:43 +0100)
commitddf3cfb95966fbb8561813b989335a85740ced8b
tree29d6b94c9470c0570ac40b896023900ad635cdc6
parent723bd40dcafaf4775b346025be60fc0871875f4f
parentb2ca27f906435e80d82f80d9c0614931891c23ef
Merge branch 'master' into dany/groovy-resolve

Conflicts:
plugins/groovy/src/META-INF/plugin.xml
plugins/groovy/src/META-INF/plugin.xml