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)
commit9bc65fe75f340a7654b8e1997877bb94ad673c50
treef767d4a15d8292b38843696b9834dc6af307961a
parent2a765d313ecf750dbb7f1b92b5c19981f57407ac
parent3e13c6dcb2928fb4af110f316f66619a99f7b4a7
Merge branch 'PHP-5.6'