]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAndrey Hristov <andrey@php.net>
Wed, 26 Jun 2013 14:51:42 +0000 (16:51 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 26 Jun 2013 14:51:42 +0000 (16:51 +0200)

Trivial merge