]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorRasmus Lerdorf <rasmus@php.net>
Mon, 1 Apr 2013 23:30:34 +0000 (16:30 -0700)
committerRasmus Lerdorf <rasmus@php.net>
Mon, 1 Apr 2013 23:30:34 +0000 (16:30 -0700)

Trivial merge