From: Johannes Schlüter <johannes@php.net>
Date: Thu, 13 Dec 2012 21:50:55 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~672^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8a2407655c29caf65f726a2cd4ad85e90bf3e08;p=php

Merge branch 'PHP-5.5'
---

f8a2407655c29caf65f726a2cd4ad85e90bf3e08