Merge remote-tracking branch 'origin/master' phpstorm/140.131
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 15 Oct 2014 13:18:45 +0000 (17:18 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 15 Oct 2014 13:18:45 +0000 (17:18 +0400)

Trivial merge