From: krakjoe <joe.watkins@live.co.uk>
Date: Thu, 8 May 2014 10:58:28 +0000 (+0100)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~384^2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c7064b2f7ee02552b2abee629bc1b0148217e91;p=php

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

8c7064b2f7ee02552b2abee629bc1b0148217e91