From: Lars Strojny <lstrojny@php.net>
Date: Sun, 2 Sep 2012 12:53:52 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
X-Git-Tag: php-5.5.0alpha3~8^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d371a306a24d15646e37c74ee8a9ab81a91f5e25;p=php

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

d371a306a24d15646e37c74ee8a9ab81a91f5e25