From: Nikita Popov <nikic@php.net>
Date: Tue, 14 Aug 2012 15:38:27 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~83
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb5417bfe08956886ed694f307bf1b79042e29ca;p=php

Merge branch 'PHP-5.4'
---

bb5417bfe08956886ed694f307bf1b79042e29ca