From: Martin Jansen <mj@php.net>
Date: Tue, 20 Mar 2012 10:16:09 +0000 (+0100)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.5.0alpha1~416
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0c87ff53c2226ecbf451bc7ef1648ec84edb320;p=php

Merge branch 'master' of git.php.net:php-src
---

a0c87ff53c2226ecbf451bc7ef1648ec84edb320