cleanup merge

author Michael Wallner <mike@php.net>

Tue, 15 May 2012 07:44:01 +0000 (09:44 +0200)

committer Michael Wallner <mike@php.net>

Tue, 15 May 2012 07:44:01 +0000 (09:44 +0200)
author Michael Wallner <mike@php.net>
Tue, 15 May 2012 07:44:01 +0000 (09:44 +0200)
committer Michael Wallner <mike@php.net>
Tue, 15 May 2012 07:44:01 +0000 (09:44 +0200)
diff --cc ext/zlib/zlib.c
Simple merge
diff --cc main/output.c
Simple merge
author	Michael Wallner <mike@php.net>
	Tue, 15 May 2012 07:44:01 +0000 (09:44 +0200)
committer	Michael Wallner <mike@php.net>
	Tue, 15 May 2012 07:44:01 +0000 (09:44 +0200)
		1	2
ext/zlib/zlib.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/output.c	patch \|	diff1 \|	diff2 \|	blob \| history