From: Johannes Schlüter <johannes@php.net>
Date: Wed, 10 Apr 2013 07:48:37 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c454c85511c9475810d39be100ee2c3eb862cfd7;p=php

Merge branch 'PHP-5.5'
---

c454c85511c9475810d39be100ee2c3eb862cfd7