]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Mon, 16 Mar 2015 07:35:10 +0000 (08:35 +0100)
committerAnatol Belski <ab@php.net>
Mon, 16 Mar 2015 07:35:10 +0000 (08:35 +0100)
* PHP-5.6:
  backport af2b0669 into 5.5


Trivial merge