]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  fix test (dos2unix, typo)


Trivial merge