]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorJohannes Schlüter <johannes@php.net>
Tue, 30 Apr 2013 12:28:18 +0000 (14:28 +0200)
committerJohannes Schlüter <johannes@php.net>
Tue, 30 Apr 2013 12:28:18 +0000 (14:28 +0200)

Trivial merge