]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorLars Strojny <lstrojny@php.net>
Mon, 14 Jan 2013 17:54:08 +0000 (18:54 +0100)
committerLars Strojny <lstrojny@php.net>
Mon, 14 Jan 2013 17:54:08 +0000 (18:54 +0100)

Trivial merge