From: Andrea Faulds <ajf@ajf.me>
Date: Wed, 6 Aug 2014 15:02:38 +0000 (+0100)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHPNG_MERGE~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c47f50137fa9902746fb9d4efc4158b299f1052;p=php

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

6c47f50137fa9902746fb9d4efc4158b299f1052