From: Ferenc Kovacs <tyrael@php.net>
Date: Sat, 3 May 2014 00:51:46 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~316
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6a1785e23eba03f71998cc2f58e0293edeed82e;p=php

Merge branch 'PHP-5.5'

* 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
---

a6a1785e23eba03f71998cc2f58e0293edeed82e