Merge branch 'upsource-master' of git.labs.intellij.net:idea/community into upsource...
authorDmitry Lomov <dmitry.lomov@jetbrains.com>
Mon, 19 Nov 2012 08:31:55 +0000 (09:31 +0100)
committerDmitry Lomov <dmitry.lomov@jetbrains.com>
Mon, 19 Nov 2012 08:31:55 +0000 (09:31 +0100)

Trivial merge