From: Ferenc Kovacs <tyrael@php.net>
Date: Sat, 3 May 2014 00:51:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta3~2^2~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c29a72d17f8663abac4dcb1d4601778a9eeb3380;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
---

c29a72d17f8663abac4dcb1d4601778a9eeb3380