]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorLars Strojny <lstrojny@php.net>
Sun, 6 Jan 2013 13:12:19 +0000 (14:12 +0100)
committerLars Strojny <lstrojny@php.net>
Sun, 6 Jan 2013 13:12:19 +0000 (14:12 +0100)

Trivial merge