From: Hannes Magnusson <bjori@php.net>
Date: Sat, 24 Mar 2012 16:59:52 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.1RC1~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10809686f0dbcbbf0eb06c968d65e0febe1dc034;p=php

Merge branch 'PHP-5.3' into PHP-5.4

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

10809686f0dbcbbf0eb06c968d65e0febe1dc034