]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d53f1bf 3732fa9)
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Wed, 19 Dec 2012 09:25:05 +0000 (10:25 +0100)
committerRemi Collet <remi@php.net>
Wed, 19 Dec 2012 09:25:05 +0000 (10:25 +0100)
* PHP-5.4:
  fix failing test on Linux build


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.