Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorDmitry Jemerov <yole@jetbrains.com>
Wed, 10 Feb 2010 15:05:41 +0000 (18:05 +0300)
committerDmitry Jemerov <yole@jetbrains.com>
Wed, 10 Feb 2010 15:05:41 +0000 (18:05 +0300)

Trivial merge