From: Andrey Hristov <andrey@php.net>
Date: Tue, 14 May 2013 10:57:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~442^2~86^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47c5ba4c0cbb0e3bb84554434a60552e3eed6136;p=php

Merge branch 'PHP-5.5'

Conflicts:
	NEWS
---

47c5ba4c0cbb0e3bb84554434a60552e3eed6136