From: Kalle Sommer Nielsen <kalle@php.net>
Date: Wed, 18 Dec 2013 06:27:14 +0000 (+0100)
Subject: Merge branch 'master' of https://git.php.net/push/php-src
X-Git-Tag: PRE_PHPNG_MERGE~353^2~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2eb9bd316d818048074c1314f73b3c9b3d490c9b;p=php

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

2eb9bd316d818048074c1314f73b3c9b3d490c9b