From: George Wang <gwang@php.net>
Date: Thu, 20 Nov 2014 21:56:03 +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~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4677616631b5975094bd9176e4c5c07d1c28fda;p=php

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

d4677616631b5975094bd9176e4c5c07d1c28fda