From: Anatoliy Belsky <ab@php.net>
Date: Mon, 30 Apr 2012 15:35:32 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.5.0alpha1~248
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e7af0f25ab4cde49b539f2e99f29fba2a95149d;p=php

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

3e7af0f25ab4cde49b539f2e99f29fba2a95149d