From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 28 Oct 2013 14:08:57 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
X-Git-Tag: php-5.4.22RC1~1^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a526f01b53e1183ba285192f7ddb0eb4b5b91ad;p=php

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

7a526f01b53e1183ba285192f7ddb0eb4b5b91ad