From: Nikita Popov <nikic@php.net>
Date: Fri, 15 Mar 2013 12:49:14 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~469
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=279285598d79384143ef350f76192c816061ca7c;p=php

Merge branch 'PHP-5.5'
---

279285598d79384143ef350f76192c816061ca7c