From: Michael Wallner <mike@php.net>
Date: Tue, 15 May 2012 07:44:01 +0000 (+0200)
Subject: cleanup merge
X-Git-Tag: php-5.5.0alpha1~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d11e55b948d99be8743c5ce61a3fdc6c3b6f2a0;p=php

cleanup merge
---

2d11e55b948d99be8743c5ce61a3fdc6c3b6f2a0