From: Johannes Schlüter <johannes@php.net>
Date: Sun, 24 Mar 2013 16:33:41 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~92^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32e0c24e7f613ec38c7ceba12d683c0deeb962ba;p=php

Merge branch 'PHP-5.5'
---

32e0c24e7f613ec38c7ceba12d683c0deeb962ba