Merge branch 'upsource-master'
authorEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Wed, 4 Jul 2012 09:48:36 +0000 (11:48 +0200)
committerEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Wed, 4 Jul 2012 09:48:36 +0000 (11:48 +0200)
commit00ae28fcae944bb3bdccf7109156c6d7a0b9992c
tree632e50f1dcc55e5da2d84024374a35ccea1858f6
parentd35bfbe0e49003ca457e41c68de5a8780037ad88
parentec79107c774ebe2442b3ccd936a482d72331598b
Merge branch 'upsource-master'

Conflicts:
java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java
plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java