From: krakjoe <joe.watkins@live.co.uk>
Date: Mon, 5 May 2014 21:45:29 +0000 (+0100)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~412
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7c529ed327cca4fad2c42fe74fabc367f24dc5b;p=php

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

d7c529ed327cca4fad2c42fe74fabc367f24dc5b