Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 25 Sep 2012 14:16:30 +0000 (18:16 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 25 Sep 2012 14:16:30 +0000 (18:16 +0400)

Trivial merge