From: Nikita Popov <nikic@php.net>
Date: Sat, 23 Mar 2013 19:14:13 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37c54255438c60423eae649c42eb6e92a803822d;p=php

Merge branch 'PHP-5.5'
---

37c54255438c60423eae649c42eb6e92a803822d