Merge remote branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 10 Aug 2011 09:47:51 +0000 (13:47 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 10 Aug 2011 09:47:51 +0000 (13:47 +0400)

Trivial merge