]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAndrey Hristov <andrey@php.net>
Thu, 8 Aug 2013 11:53:08 +0000 (13:53 +0200)
committerAndrey Hristov <andrey@php.net>
Thu, 8 Aug 2013 11:53:08 +0000 (13:53 +0200)

Trivial merge