Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 16 Oct 2013 12:05:14 +0000 (14:05 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 16 Oct 2013 12:05:14 +0000 (14:05 +0200)

Trivial merge