]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorJohannes Schlüter <johannes@schlueters.de>
Thu, 21 Feb 2013 15:51:37 +0000 (16:51 +0100)
committerJohannes Schlüter <johannes@schlueters.de>
Thu, 21 Feb 2013 15:51:37 +0000 (16:51 +0100)

Trivial merge