]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorJohannes Schlüter <johannes@php.net>
Tue, 23 Jul 2013 10:42:20 +0000 (12:42 +0200)
committerJohannes Schlüter <johannes@php.net>
Tue, 23 Jul 2013 10:42:20 +0000 (12:42 +0200)

Trivial merge