Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sun, 9 Dec 2012 17:10:30 +0000 (18:10 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sun, 9 Dec 2012 17:10:30 +0000 (18:10 +0100)

Trivial merge