Merge remote-tracking branch 'origin/master' phpstorm/162.725
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 2 Jun 2016 10:50:28 +0000 (13:50 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 2 Jun 2016 10:50:28 +0000 (13:50 +0300)
commit11a559364a961c7710585080644405333ae1d931
tree2a46047a1a2560dcd7c24c86eff7dcb02536770a
parenteeb8783169383904a92062ebd3426db147cb6de7
parentaf6fab8d464aec9396c68febe59ccc68dded0eaa
Merge remote-tracking branch 'origin/master'