From: Ferenc Kovacs <tyrael@php.net>
Date: Tue, 29 Apr 2014 22:07:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~333^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98fcee48f9b9e3d2ca3472a4e907565e0eccb7a5;p=php

Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6

* origin/PHP-5.5:
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory

Conflicts:
	ext/mbstring/tests/zend_multibyte-08.phpt
---

98fcee48f9b9e3d2ca3472a4e907565e0eccb7a5