]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorSebastian Bergmann <sebastian@php.net>
Sun, 16 Dec 2012 08:08:01 +0000 (09:08 +0100)
committerSebastian Bergmann <sebastian@php.net>
Sun, 16 Dec 2012 08:08:01 +0000 (09:08 +0100)

Trivial merge