From: Nikita Popov <nikic@php.net>
Date: Sun, 24 Mar 2013 16:55:01 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~92^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e8423b041fc3a60b6c85388519ad6a5cfd855c4;p=php

Merge branch 'PHP-5.5'
---

1e8423b041fc3a60b6c85388519ad6a5cfd855c4