]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 11:29:05 +0000 (12:29 +0100)
committerAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 11:29:05 +0000 (12:29 +0100)
* PHP-5.6:
  add test for bug #69111


Trivial merge