]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorJohannes Schlüter <johannes@php.net>
Sun, 23 Feb 2014 13:57:21 +0000 (14:57 +0100)
committerJohannes Schlüter <johannes@php.net>
Sun, 23 Feb 2014 13:57:21 +0000 (14:57 +0100)

Trivial merge