From: Andrey Hristov <andrey@php.net>
Date: Wed, 13 Mar 2013 14:57:04 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~474
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4279f0d5ec347d8bddcdc090c236c8638c95e6f;p=php

Merge branch 'PHP-5.5'

Conflicts:
	NEWS
---

f4279f0d5ec347d8bddcdc090c236c8638c95e6f