From: krakjoe <joe.watkins@live.co.uk>
Date: Sun, 2 Feb 2014 13:42:01 +0000 (+0000)
Subject: Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
X-Git-Tag: php-5.6.0alpha2~1^2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4a120d66aaf44cd0dc71f39a49998b924c2ef0e;p=php

Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
---

a4a120d66aaf44cd0dc71f39a49998b924c2ef0e