From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 6 Jan 2013 15:09:55 +0000 (+0000)
Subject: Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
X-Git-Tag: php-5.5.0alpha3~6^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0de5fb4165aa7693fd90c44e61bf885a04322d0f;p=php

Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
---

0de5fb4165aa7693fd90c44e61bf885a04322d0f