]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorJohannes Schlüter <johannes@php.net>
Wed, 5 Dec 2012 18:03:15 +0000 (19:03 +0100)
committerJohannes Schlüter <johannes@php.net>
Wed, 5 Dec 2012 18:03:15 +0000 (19:03 +0100)

Trivial merge