From: Johannes Schlüter <johannes@php.net>
Date: Thu, 28 Mar 2013 14:09:28 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5b80049734bfed54d452bcfcc3f68757d15ad63;p=php

Merge branch 'PHP-5.5'
---

c5b80049734bfed54d452bcfcc3f68757d15ad63