]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorJohannes Schlüter <johannes@php.net>
Tue, 29 Jan 2013 18:50:44 +0000 (19:50 +0100)
committerJohannes Schlüter <johannes@php.net>
Tue, 29 Jan 2013 18:50:44 +0000 (19:50 +0100)

Trivial merge