Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 16 Nov 2011 18:08:42 +0000 (19:08 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 16 Nov 2011 18:08:42 +0000 (19:08 +0100)

Trivial merge