]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5
authorLars Strojny <lstrojny@php.net>
Sat, 19 Jan 2013 00:06:13 +0000 (01:06 +0100)
committerLars Strojny <lstrojny@php.net>
Sat, 19 Jan 2013 00:06:13 +0000 (01:06 +0100)

Trivial merge