From: Johannes Schlüter <johannes@php.net>
Date: Wed, 18 Apr 2012 20:51:15 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-5.5.0alpha1~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3b3450f010a8368a142034cef56fbab7f26212e;p=php

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

* 'master' of git.php.net:/php-src:
---

f3b3450f010a8368a142034cef56fbab7f26212e