Merge remote-tracking branch 'origin/master' phpstorm/138.226
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 19 May 2014 11:01:00 +0000 (15:01 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 19 May 2014 11:01:00 +0000 (15:01 +0400)

Trivial merge