From: Gustavo Lopes <gustavo@icemobile.com>
Date: Mon, 14 Jan 2013 16:19:23 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~64^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ce5a225899c19b79c64451e830cd3940ee2bff3;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	NEWS
---

1ce5a225899c19b79c64451e830cd3940ee2bff3