Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 13 Feb 2014 18:06:02 +0000 (19:06 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 13 Feb 2014 18:06:02 +0000 (19:06 +0100)

Trivial merge