Automaetd merge.

author Saint Xavier <wget@sxav.eu>

Sun, 8 Jun 2008 11:00:15 +0000 (13:00 +0200)

committer Saint Xavier <wget@sxav.eu>

Sun, 8 Jun 2008 11:00:15 +0000 (13:00 +0200)
author Saint Xavier <wget@sxav.eu>
Sun, 8 Jun 2008 11:00:15 +0000 (13:00 +0200)
committer Saint Xavier <wget@sxav.eu>
Sun, 8 Jun 2008 11:00:15 +0000 (13:00 +0200)
diff --cc src/http.c
Simple merge
diff --cc src/init.c
Simple merge
diff --cc src/main.c
Simple merge
author	Saint Xavier <wget@sxav.eu>
	Sun, 8 Jun 2008 11:00:15 +0000 (13:00 +0200)
committer	Saint Xavier <wget@sxav.eu>
	Sun, 8 Jun 2008 11:00:15 +0000 (13:00 +0200)
		1	2
src/http.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.c	patch \|	diff1 \|	diff2 \|	blob \| history