Merge branch 'master' of git.labs.intellij.net:idea/community
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Mon, 15 Nov 2010 13:33:46 +0000 (16:33 +0300)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Mon, 15 Nov 2010 13:33:46 +0000 (16:33 +0300)
commitd66d9fae8ee53a2d6eec8c8f8c6a1f081d94547e
treeff59615d11dde4e27e4d905aef9cf9bbad73ecd9
parent3750968b69002884ade58539e4e9f24092c6c1fb
parente4f0845d13ce7ef63bbcca500142889d82749fe1
Merge branch 'master' of git.labs.intellij.net:idea/community
plugins/groovy/src/META-INF/plugin.xml