From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 14 Dec 2012 00:43:04 +0000 (-0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~672^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c701aeba0bbd8c74059699fcbf339e8a04ebfe3e;p=php

Merge branch 'PHP-5.5'
---

c701aeba0bbd8c74059699fcbf339e8a04ebfe3e