From: George Wang <gwang@php.net>
Date: Mon, 3 Nov 2014 16:43:43 +0000 (-0500)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.20RC1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3918e544d86532ffede42f45ac278daf5c4e8e0f;p=php

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

3918e544d86532ffede42f45ac278daf5c4e8e0f