]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Wed, 18 Jul 2012 11:25:56 +0000 (19:25 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 18 Jul 2012 11:25:56 +0000 (19:25 +0800)
commit44462955f845c8d1cf0952f81a8b243b47e2ec24
tree753373bca9b23cbcf7834447cafddcf3469b10f7
parentecc960e86231e610ff2f79243fd01b8d73dd305a
parent282a6659aab94133bb9f95148b2540018333a8ca
Merge branch 'PHP-5.4'

* PHP-5.4:
  fix test (dos2unix, typo)