]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorLars Strojny <lstrojny@php.net>
Tue, 15 Jan 2013 21:12:09 +0000 (22:12 +0100)
committerLars Strojny <lstrojny@php.net>
Tue, 15 Jan 2013 21:12:09 +0000 (22:12 +0100)

Trivial merge