From: Nikita Popov <nikic@php.net>
Date: Sat, 9 Mar 2013 19:22:29 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~482
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3670085d7d5fc7ada58e8c6df942563cfe5a6946;p=php

Merge branch 'PHP-5.5'
---

3670085d7d5fc7ada58e8c6df942563cfe5a6946