]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Fri, 6 Dec 2013 09:39:10 +0000 (10:39 +0100)
committerMichael Wallner <mike@php.net>
Fri, 6 Dec 2013 09:39:10 +0000 (10:39 +0100)
* PHP-5.5:
  BFN


Trivial merge