From: Rasmus Lerdorf <rasmus@php.net>
Date: Mon, 1 Apr 2013 23:30:34 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~57^2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91c514c49a9f909fd6d1564b6d53dd59e716bef1;p=php

Merge branch 'PHP-5.5'
---

91c514c49a9f909fd6d1564b6d53dd59e716bef1