From: Lars Strojny <lstrojny@php.net>
Date: Wed, 19 Sep 2012 20:18:16 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
X-Git-Tag: php-5.4.9RC1~30^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd6b7ea7bd31ec3253004901285ae0d191974c6e;p=php

Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
---

dd6b7ea7bd31ec3253004901285ae0d191974c6e