From: Andrey Hristov <andrey@php.net>
Date: Tue, 20 May 2014 11:51:16 +0000 (+0300)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~317
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=759f1009ad1d554c59fb9a6ef2407342c53b00b3;p=php

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

759f1009ad1d554c59fb9a6ef2407342c53b00b3