From: Christopher Jones <sixd@php.net>
Date: Fri, 19 Oct 2012 01:55:48 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c8cccd0b5dc172ca041d951c3ff4bd47af8eaae;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Add fix & missing fix
---

0c8cccd0b5dc172ca041d951c3ff4bd47af8eaae