From: Johannes Schlüter <johannes@php.net>
Date: Wed, 5 Dec 2012 18:03:04 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd6bf838d5af7e4b402b57fc10526e6c453ad5c5;p=php

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

cd6bf838d5af7e4b402b57fc10526e6c453ad5c5