]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 20 Jan 2014 13:44:43 +0000 (14:44 +0100)
committerRemi Collet <remi@php.net>
Mon, 20 Jan 2014 13:44:43 +0000 (14:44 +0100)
* PHP-5.6:
  Skip those test which fails on ARM architecture
  dos2unix


Trivial merge