Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 22 Aug 2013 00:06:57 +0000 (02:06 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 22 Aug 2013 00:06:57 +0000 (02:06 +0200)

Trivial merge