From: Anatol Belski <ab@php.net>
Date: Thu, 21 Aug 2014 07:21:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'php/master'
X-Git-Tag: POST_64BIT_BRANCH_MERGE^2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d6ef99a390f9437e2eda113b04f564c4e94b294;p=php

Merge remote-tracking branch 'php/master'
---

8d6ef99a390f9437e2eda113b04f564c4e94b294