From: Christopher Jones <sixd@php.net>
Date: Thu, 15 Aug 2013 04:33:27 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82dd6b94f28a49c4b109d223ebe6b2b5650388e1;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
---

82dd6b94f28a49c4b109d223ebe6b2b5650388e1