Merge branch 'master' of git.labs.intellij.net:idea/community cidr/108.296 idea/108.298 pycharm/108.299 rubymine/108.300 storm/108.295
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 24 May 2011 19:42:18 +0000 (23:42 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 24 May 2011 19:42:18 +0000 (23:42 +0400)
commitda854e1d47c21f39df849c55f98c92e33edbf7f6
tree7b3e0a66b79b772ec43ad4013db1e51ac314ef25
parenta37cbb16805d7937f5107581c5a473560355ec78
parenta0620046569a311c8bcde7f3b270d773d850af5c
Merge branch 'master' of git.labs.intellij.net:idea/community
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java