Merge branch 'master' of git@git.labs.intellij.net:idea/community
commit7f5a4797a330631434699bfdc6807295edaabfa4
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 9 Feb 2010 11:57:56 +0000 (9 14:57 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 9 Feb 2010 11:57:56 +0000 (9 14:57 +0300)
treed96782361e68108a7dba655bbeb0b638e089ba87
parent056400026f0560e8ccd93ebbc60450e5734dacca
parent4189b6e87e0690697fab42f85a75eb5ff99b9dc6
Merge branch 'master' of git@git.labs.intellij.net:idea/community