From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Mon, 23 Apr 2012 21:10:50 +0000 (+0100)
Subject: Merge branch '5.4'
X-Git-Tag: php-5.5.0alpha1~271
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d77cde46e138b41c944807545489e82c4ac12b8d;p=php

Merge branch '5.4'
---

d77cde46e138b41c944807545489e82c4ac12b8d