From: Pierre Joye <pierre.php@gmail.com>
Date: Thu, 20 Jun 2013 20:34:04 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.6.0alpha1~414
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4718f892cb65d900bb0e9529847f9e0b1f7625de;p=php

Merge branch 'master' of git.php.net:php-src
---

4718f892cb65d900bb0e9529847f9e0b1f7625de