From: Johannes Schlüter <johannes@php.net>
Date: Mon, 10 Dec 2012 12:36:05 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c007ba4740e90a7a73bc8c6350804670e4b49cc1;p=php

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

c007ba4740e90a7a73bc8c6350804670e4b49cc1