Merge remote-tracking branch 'origin/master' idea/134.1298 phpstorm/134.1301
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 25 Feb 2014 22:34:02 +0000 (23:34 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 25 Feb 2014 22:34:02 +0000 (23:34 +0100)

Trivial merge