Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 4 Feb 2014 11:56:26 +0000 (15:56 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 4 Feb 2014 11:56:26 +0000 (15:56 +0400)

Trivial merge