]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sun, 31 May 2015 21:04:11 +0000 (23:04 +0200)
committerAnatol Belski <ab@php.net>
Sun, 31 May 2015 21:04:11 +0000 (23:04 +0200)
commit8e54f91cc91b1ca9ab531dd58f609415e9d18f29
tree5758bf168421a27fcacc9aa276cb1ac1f15f100c
parent6fea2f1dd7cc050062c50638c551b51e60844f5c
parent34bcd69f824a724fa5272cd0c2dc649fec8a4f13
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix phpize mode for manifest embedding