Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 2 Dec 2010 15:44:29 +0000 (18:44 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 2 Dec 2010 15:44:29 +0000 (18:44 +0300)
commit64f871932af8d7012b17c50eafe1af800019fb1d
treec405e03de023964a3d77c2e809fa8f4720dc1c2c
parentceecdf3033e402ac5b67b3864486c4bf9dca0bcb
parentec377661e4ac91e79a9b4f7a8696cae687698856
Merge branch 'master' of git.labs.intellij.net:idea/community