]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Mon, 2 Dec 2013 11:15:27 +0000 (12:15 +0100)
committerMichael Wallner <mike@php.net>
Mon, 2 Dec 2013 11:15:27 +0000 (12:15 +0100)
* PHP-5.5:
  BFN
  fix bug #49634x


Trivial merge