Merge branch 'master' of git.labs.intellij.net:idea/community
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 29 Dec 2010 08:01:26 +0000 (11:01 +0300)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 29 Dec 2010 08:01:26 +0000 (11:01 +0300)

Trivial merge