]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorJohannes Schlüter <johannes@php.net>
Thu, 14 Aug 2014 15:27:12 +0000 (17:27 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 14 Aug 2014 15:27:12 +0000 (17:27 +0200)

Trivial merge