Merge remote-tracking branch 'origin/master' phpstorm/134.1377
authorVladimir Orlov <vladimir.orlov@jetbrains.com>
Sat, 1 Mar 2014 08:57:18 +0000 (12:57 +0400)
committerVladimir Orlov <vladimir.orlov@jetbrains.com>
Sat, 1 Mar 2014 08:57:18 +0000 (12:57 +0400)

Trivial merge