]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorJohannes Schlüter <johannes@php.net>
Sat, 18 Jan 2014 12:53:15 +0000 (13:53 +0100)
committerJohannes Schlüter <johannes@php.net>
Sat, 18 Jan 2014 12:53:15 +0000 (13:53 +0100)

Trivial merge