Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 2 Jun 2010 15:33:02 +0000 (19:33 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 2 Jun 2010 15:33:02 +0000 (19:33 +0400)
commit1a4a8238c5d8e0d4d310c27e50d4a14ae43712e5
tree5ce8d8f7c81c88170a6a33bdbca5611b713c62cd
parentce667164a30aea8daa9e7c78b037dc70aa13463d
parent2475e6fe7dd8ef29857000fdee47d95b3f4e1e5b
Merge branch 'master' of git@git.labs.intellij.net:idea/community