Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 5 Mar 2013 17:27:19 +0000 (18:27 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 5 Mar 2013 17:27:19 +0000 (18:27 +0100)

Trivial merge