From: Pierre Joye <pierre.php@gmail.com>
Date: Thu, 15 May 2014 09:50:09 +0000 (+0200)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~359
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17c68b9fd87b6569db299767e497a2a25b273e17;p=php

Merge branch 'phpng' of git.php.net:php-src into phpng

# By Dmitry Stogov (2) and Xinchen Hui (1)
# Via Dmitry Stogov (2) and Xinchen Hui (1)
* 'phpng' of git.php.net:php-src:
  Fixed zend_string/char* mess
  Refactored ext/xsl, need some help in 3 tests failed
  Fixed SoapFault handling
---

17c68b9fd87b6569db299767e497a2a25b273e17