\Merge branch 'master' of ../../IDEA3\r\r# Please enter a commit message to explain...
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 12 Aug 2014 16:39:01 +0000 (18:39 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 12 Aug 2014 16:39:01 +0000 (18:39 +0200)

Trivial merge