Merge branch 'master' of git.labs.intellij.net:idea/community
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 28 Dec 2010 16:20:15 +0000 (19:20 +0300)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 28 Dec 2010 16:20:15 +0000 (19:20 +0300)
commitfe626603618c291014dfe1afed3cef369802f237
tree07d584b09ed6bbdbeddfd9a84590023b5e1ec0d9
parentae0d8490a8f83c58e69145a10c5041e250fbfc6a
parentc7b28e6a9e0ff6ed20e7e946be41283b1b2175d0
Merge branch 'master' of git.labs.intellij.net:idea/community