]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Wed, 13 Feb 2013 12:50:53 +0000 (13:50 +0100)
committerArd Biesheuvel <ard.biesheuvel@linaro.org>
Wed, 13 Feb 2013 12:50:53 +0000 (13:50 +0100)

Trivial merge