From: krakjoe <joe.watkins@live.co.uk>
Date: Wed, 7 May 2014 11:04:04 +0000 (+0100)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~384^2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f9ecf42b6e9f89b28318bb01de034f9c3aaef38;p=php

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

1f9ecf42b6e9f89b28318bb01de034f9c3aaef38