Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 30 Jan 2013 14:14:07 +0000 (15:14 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 30 Jan 2013 14:14:07 +0000 (15:14 +0100)

Trivial merge