]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorJohannes Schlüter <johannes@php.net>
Thu, 13 Dec 2012 21:50:55 +0000 (22:50 +0100)
committerJohannes Schlüter <johannes@php.net>
Thu, 13 Dec 2012 21:50:55 +0000 (22:50 +0100)

Trivial merge