From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 29 Apr 2015 11:21:29 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d718fe859b61463f82105d12abe1e336c83172b;p=php

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

* 'master' of git.php.net:php-src:
  5.5.26 now
---

1d718fe859b61463f82105d12abe1e336c83172b