Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Lomov <dmitry.lomov@jetbrains.com>
Wed, 20 Feb 2013 15:40:46 +0000 (16:40 +0100)
committerDmitry Lomov <dmitry.lomov@jetbrains.com>
Wed, 20 Feb 2013 15:40:46 +0000 (16:40 +0100)

Trivial merge