From: krakjoe <joe.watkins@live.co.uk>
Date: Wed, 20 Nov 2013 16:26:21 +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.0alpha1~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0e3cb08e616a67d3eaddef665e27566a774ef78;p=php

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

a0e3cb08e616a67d3eaddef665e27566a774ef78