Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 17 Dec 2010 13:38:07 +0000 (16:38 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 17 Dec 2010 13:38:07 +0000 (16:38 +0300)
commit6f1d5b5aef36d27f79de5a9c35c4c7df6a8832f7
tree73af609451e8a889355cbe2f8751eb12583d6857
parent753d328a41b120b932677f3ec3379e48309a5428
parent5c817f9dd50fef5de9a51af2698602e3de804af4
Merge branch 'master' of git.labs.intellij.net:idea/community