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

Merge branch 'PHP-5.5'
---

453bcfecbfdd95e5e5449b7d0ae8f6f0cb5b1cea