From: Lars Strojny <lstrojny@php.net>
Date: Sat, 29 Dec 2012 02:36:06 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8a9a47e8cde62a082a54371c08eedb4c1366b77;p=php

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

f8a9a47e8cde62a082a54371c08eedb4c1366b77