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

Merge branch 'PHP-5.5'
---

03c55d697132e871f696d6c185a58395d31a0e80