]> granicus.if.org Git - php/commit
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)
commit10809686f0dbcbbf0eb06c968d65e0febe1dc034
tree01d7fcd9f023b4cf2cd03823ac3828cc837350dc
parent7a1c76538541e74719faf2311d72a70acd3c01e4
parent948d326b294becccf1e1a34851bce380f2381b96
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix test on FreeBSD and other systems that have /etc/services