Merge branch 'master' of git.labs.intellij.net:idea/community
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sun, 2 Jan 2011 12:20:12 +0000 (15:20 +0300)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sun, 2 Jan 2011 12:20:12 +0000 (15:20 +0300)
commit1bf3e260308b7a8b39e4f894d3c2c54fcd32748e
tree0a0fdf62e15d66a96dc0b1a83520269b995d1c4d
parentdc09dbc4ea2c6b324b67a0365f32f661bd263dd6
parent15aee28bb269c9289c89bce223f2def96c5701e0
Merge branch 'master' of git.labs.intellij.net:idea/community

Conflicts:
plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java