]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@gmail.com>
Tue, 20 Mar 2012 07:27:41 +0000 (15:27 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 20 Mar 2012 07:27:41 +0000 (15:27 +0800)
commita0d149bc50e2f78352f05a40fa5e478cf56e4803
treef313385a129564b7731e432c75db99e16a64b508
parenteda790de0fbd5e7454c2efd5dc33a575bec9631f
parent30bd2494a29c45faf7ddac37601fa2588856c7fe
Merge branch 'PHP-5.4'

* PHP-5.4:
  Use newdoc instead of escape char
  adapt makedist to git