]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a1c765 948d326)
Merge branch 'PHP-5.3' into PHP-5.4
authorHannes Magnusson <bjori@php.net>
Sat, 24 Mar 2012 16:59:52 +0000 (17:59 +0100)
committerHannes Magnusson <bjori@php.net>
Sat, 24 Mar 2012 16:59:52 +0000 (17:59 +0100)
* PHP-5.3:
  Fix test on FreeBSD and other systems that have /etc/services


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