]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Tue, 10 Dec 2013 11:12:44 +0000 (12:12 +0100)
committerArd Biesheuvel <ard.biesheuvel@linaro.org>
Tue, 10 Dec 2013 11:12:44 +0000 (12:12 +0100)

Trivial merge