From: Lars Strojny <lstrojny@php.net>
Date: Wed, 30 Jan 2013 23:33:46 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b48a86a179a741da9f468e3a54994f7ee4ea211;p=php

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

6b48a86a179a741da9f468e3a54994f7ee4ea211