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

Trivial merge