]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorJohannes Schlüter <johannes@php.net>
Thu, 4 Apr 2013 13:38:35 +0000 (15:38 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 4 Apr 2013 13:38:35 +0000 (15:38 +0200)

Trivial merge