Merge branch 'master' of git.labs.intellij.net:idea/community into groovyfolding
authorpeter <peter.gromov@jetbrains.com>
Thu, 4 Mar 2010 21:09:30 +0000 (21:09 +0000)
committerpeter <peter.gromov@jetbrains.com>
Thu, 4 Mar 2010 21:09:30 +0000 (21:09 +0000)
commit8e0982fad50b8b8e15c7ff30f7a80d5d481e843a
tree4a898bb388be2d3268ed1767040463c5d103ee88
parent748d6a4c023cc6f6f5b62692815114d098d8a097
parente4334829a64c737277e91e9af7e1e5cd15ff2a75
Merge branch 'master' of git.labs.intellij.net:idea/community into groovyfolding