From: Adam Harvey <aharvey@php.net>
Date: Fri, 21 Nov 2014 00:18:42 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.20RC1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73cb5ca777660c0226431f709829a07bf6796120;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

73cb5ca777660c0226431f709829a07bf6796120