]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Sat, 1 Aug 2015 12:21:01 +0000 (14:21 +0200)
committerChristoph M. Becker <cmb@php.net>
Sat, 1 Aug 2015 12:21:01 +0000 (14:21 +0200)

Trivial merge