Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 18 Feb 2013 20:07:35 +0000 (21:07 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 18 Feb 2013 20:07:35 +0000 (21:07 +0100)

Trivial merge