Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Sun, 27 Sep 2015 13:48:42 +0000 (15:48 +0200)
committerAnatol Belski <ab@php.net>
Sun, 27 Sep 2015 13:48:42 +0000 (15:48 +0200)
commit250938e2d35fc54161a18167b7901c5e3b574371
tree6a543aea6b8656c5ee283993fd73460ff3f586be
parent7d3844123f452f5c082ed2e96ef68b2c219ecf11
parentc82e21619eb0644221a166c1179bed0f08c2f640
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix phpdbg's -h switch