From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 31 Jul 2013 12:35:09 +0000 (+0400)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~366^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=380e5d5d03fdd122cf49c9c0aa5bcd1a09a641ca;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
	NEWS
---

380e5d5d03fdd122cf49c9c0aa5bcd1a09a641ca