]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorJohannes Schlüter <johannes@php.net>
Fri, 10 Jan 2014 15:04:29 +0000 (16:04 +0100)
committerJohannes Schlüter <johannes@php.net>
Fri, 10 Jan 2014 15:04:29 +0000 (16:04 +0100)

Trivial merge