From: Nuno Lopes <nlopess@php.net>
Date: Sun, 27 May 2012 23:58:00 +0000 (-0400)
Subject: Merge branch 'master' of https://git.php.net/push/php-src
X-Git-Tag: php-5.5.0alpha1~129^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5d054d3a5fc5cb3ec59fe9205e5dcb3ed8ff0ab;p=php

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

c5d054d3a5fc5cb3ec59fe9205e5dcb3ed8ff0ab