Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 17 Mar 2014 14:44:33 +0000 (15:44 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 17 Mar 2014 14:44:33 +0000 (15:44 +0100)

Trivial merge