]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorMichael Wallner <mike@php.net>
Tue, 24 Apr 2012 18:43:59 +0000 (20:43 +0200)
committerMichael Wallner <mike@php.net>
Tue, 24 Apr 2012 18:43:59 +0000 (20:43 +0200)
* PHP-5.4:
  BFN


Trivial merge