From: Johannes Schlüter <johannes@php.net>
Date: Thu, 3 Jan 2013 22:00:30 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~628
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c6ce227dcdaecbd04024f7b9362552c48786edc;p=php

Merge branch 'PHP-5.5'
---

0c6ce227dcdaecbd04024f7b9362552c48786edc