From: Nikita Popov <nikic@php.net>
Date: Wed, 3 Apr 2013 18:30:31 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~57^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1ee0349d68ee44f04c423d519fc5b0ad07aa0d4;p=php

Merge branch 'PHP-5.5'
---

d1ee0349d68ee44f04c423d519fc5b0ad07aa0d4