Merge branch 'master' of git@git.labs.intellij.net:idea/community cidr/96.1148
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Fri, 10 Sep 2010 16:23:15 +0000 (20:23 +0400)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Fri, 10 Sep 2010 16:23:15 +0000 (20:23 +0400)
commit58f8036c4797b9fc144f4ac0fcdd6cc71e779b10
tree9c26f2de1651d01e4ffa7d053d065351de181a73
parenta818eebefd0dd8bdca44e3409cc970daaa940bc0
parent56ec24314b292f1eec6d148f7e50d6ccdb64c3af
Merge branch 'master' of git@git.labs.intellij.net:idea/community