From: Nikita Popov <nikic@php.net>
Date: Tue, 12 Mar 2013 16:29:54 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~476
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81623d3a60599d05c83987dec111bf56809f901d;p=php

Merge branch 'PHP-5.5'

Conflicts:
	UPGRADING
	UPGRADING.INTERNALS
---

81623d3a60599d05c83987dec111bf56809f901d