From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 26 Nov 2014 23:13:11 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fcf21c4d00453f90b69894f1131ae505d92696ee;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
  5.5.21 now

Conflicts:
	configure.in
	main/php_version.h
---

fcf21c4d00453f90b69894f1131ae505d92696ee