]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorLars Strojny <lstrojny@php.net>
Sat, 29 Dec 2012 02:36:06 +0000 (03:36 +0100)
committerLars Strojny <lstrojny@php.net>
Sat, 29 Dec 2012 02:36:06 +0000 (03:36 +0100)

Trivial merge