]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Mon, 9 Dec 2013 16:04:05 +0000 (17:04 +0100)
committerArd Biesheuvel <ard.biesheuvel@linaro.org>
Mon, 9 Dec 2013 16:04:05 +0000 (17:04 +0100)

Trivial merge