]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Wed, 11 Dec 2013 07:51:10 +0000 (08:51 +0100)
committerArd Biesheuvel <ard.biesheuvel@linaro.org>
Wed, 11 Dec 2013 07:51:10 +0000 (08:51 +0100)

Trivial merge