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

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

21a45d9acaad2e53b6a7b2a6798ceb8e255e106f