Merge branch 'master' of git.labs.intellij.net:idea/community into groovyfolding
authorpeter <peter.gromov@jetbrains.com>
Thu, 4 Mar 2010 15:15:03 +0000 (15:15 +0000)
committerpeter <peter.gromov@jetbrains.com>
Thu, 4 Mar 2010 15:15:03 +0000 (15:15 +0000)
commit58c8817f4d282be6dee6a390cbaed49054619736
tree21905b89f22e1c89629b01ca107ad947e92c2dcd
parentc600515a0c55440a9762bac623c2b5d628035d37
parent503a55b9eebd6f24da4c6acf653764599a5ef5a3
Merge branch 'master' of git.labs.intellij.net:idea/community into groovyfolding