From: andrey <andrey@php.net>
Date: Mon, 7 May 2012 11:32:05 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.5.0alpha1~232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9927cc5f4b0e626e601d542b0b50e82c54650ac8;p=php

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

9927cc5f4b0e626e601d542b0b50e82c54650ac8