Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 21 Dec 2010 14:55:40 +0000 (17:55 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 21 Dec 2010 14:55:40 +0000 (17:55 +0300)
commit422d847a923df137af69554d7fa45dbedb294096
tree0940f8423d78364b20769d114ff60bbb5450f3c9
parent4fd414801ff05ce5190d6d5f2f165d28af262f1f
parenta162cbde61eef8331620361d98014e5e7e350ea9
Merge branch 'master' of git.labs.intellij.net:idea/community