]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Wed, 18 Jun 2014 13:45:12 +0000 (16:45 +0300)
committerAndrey Hristov <andrey@php.net>
Wed, 18 Jun 2014 13:45:12 +0000 (16:45 +0300)

Trivial merge