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

Trivial merge