From: Michael Wallner <mike@php.net>
Date: Tue, 24 Apr 2012 17:52:45 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~268
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=342b641a93355e9debea263b66accd5726d8ae04;p=php

Merge branch 'PHP-5.4'
---

342b641a93355e9debea263b66accd5726d8ae04