Merge branch 'master' of git.labs.intellij.net:idea/community
authorMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Tue, 12 Jan 2010 17:30:06 +0000 (20:30 +0300)
committerMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Tue, 12 Jan 2010 17:30:06 +0000 (20:30 +0300)

Trivial merge