From: Andrea Faulds <ajf@ajf.me>
Date: Tue, 19 Aug 2014 23:34:12 +0000 (+0100)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=115698d832c8af01f7eb0b5d2bd5bbef0b81f95e;p=php

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

115698d832c8af01f7eb0b5d2bd5bbef0b81f95e