]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Tue, 1 Oct 2013 09:08:20 +0000 (11:08 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Oct 2013 09:08:20 +0000 (11:08 +0200)
* PHP-5.4:
  Fixed bug #61548


Trivial merge