From: krakjoe <joe.watkins@live.co.uk>
Date: Tue, 6 May 2014 07:01:26 +0000 (+0100)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~410
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=362e1db428c08f4ff8cac3b059b36013c398fada;p=php

Merge branch 'phpng' of git.php.net:php-src into phpng
---

362e1db428c08f4ff8cac3b059b36013c398fada