From: Johannes Schlüter <johannes@schlueters.de>
Date: Thu, 21 Feb 2013 15:51:37 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~516
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08a52b7087a8fd723eecbd28fd8edc12cf966d28;p=php

Merge branch 'PHP-5.5'
---

08a52b7087a8fd723eecbd28fd8edc12cf966d28