From: Derick Rethans <github@derickrethans.nl>
Date: Thu, 28 Nov 2013 14:45:56 +0000 (+0000)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHPNG_MERGE~353^2~171^2~16^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d65cd50ddd409d37b208ae3fc5adbb7b22d1379;p=php

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

0d65cd50ddd409d37b208ae3fc5adbb7b22d1379