]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Wed, 17 Aug 2016 11:24:07 +0000 (13:24 +0200)
committerAnatol Belski <ab@php.net>
Wed, 17 Aug 2016 11:24:07 +0000 (13:24 +0200)
commitcec9fb171739406142088a16f50c41f73ddb2194
tree9e6ca95ea4e753819b0b2e479825120b09e195d3
parent505dd776beee461c09018ab151606229dae74e8d
parentf7231acadfe79f5d42ffd26671451610ee1e1c07
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix char * vs zend_string *