From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 3 Mar 2013 18:00:42 +0000 (-0500)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~500^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b267ad3902e2e4b22cc3b3d5beec34fe529a10c4;p=php

Merge branch 'PHP-5.5'

Conflicts:
	NEWS
---

b267ad3902e2e4b22cc3b3d5beec34fe529a10c4