From: Anatol Belski <ab@php.net>
Date: Mon, 12 Jan 2015 12:01:27 +0000 (+0100)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_REMOVALS~25^2~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13657f3e9c74564db7ef6e819520902c2208c7bb;p=php

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

13657f3e9c74564db7ef6e819520902c2208c7bb