From: Nikita Popov <nikic@php.net>
Date: Wed, 30 Jan 2013 19:42:30 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~572
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a25dd382caee3a3c82ec072dbc40e52ce49a780;p=php

Merge branch 'PHP-5.5'
---

9a25dd382caee3a3c82ec072dbc40e52ce49a780