]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorJohannes Schlüter <johannes@php.net>
Sat, 27 Sep 2014 00:18:29 +0000 (02:18 +0200)
committerJohannes Schlüter <johannes@php.net>
Sat, 27 Sep 2014 00:18:29 +0000 (02:18 +0200)

Trivial merge