Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 6 Feb 2014 08:39:48 +0000 (12:39 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 6 Feb 2014 08:39:48 +0000 (12:39 +0400)

Trivial merge