]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorMatteo Beccati <mbeccati@php.net>
Sat, 6 Dec 2014 09:24:27 +0000 (10:24 +0100)
committerMatteo Beccati <mbeccati@php.net>
Sat, 6 Dec 2014 09:24:27 +0000 (10:24 +0100)
* PHP-5.5:
  Fix compilation error (ref #68424)


Trivial merge