Merge pull request 210 phpstorm/138.2523
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sat, 27 Sep 2014 09:50:39 +0000 (13:50 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sat, 27 Sep 2014 09:50:39 +0000 (13:50 +0400)

Trivial merge