]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 30 Jan 2014 00:59:46 +0000 (17:59 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 30 Jan 2014 00:59:46 +0000 (17:59 -0700)
* PHP-5.6:
  Fixed build breakage from b4b4d9697f


Trivial merge