]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Fri, 10 Oct 2014 09:46:18 +0000 (11:46 +0200)
committerArd Biesheuvel <ard.biesheuvel@linaro.org>
Fri, 10 Oct 2014 09:46:18 +0000 (11:46 +0200)

Trivial merge