Merge branch 'dieter/experimental' into experimental

author Barrucadu <mike@barrucadu.co.uk>

Mon, 4 May 2009 09:42:32 +0000 (10:42 +0100)

committer Barrucadu <mike@barrucadu.co.uk>

Mon, 4 May 2009 09:42:32 +0000 (10:42 +0100)
author Barrucadu <mike@barrucadu.co.uk>
Mon, 4 May 2009 09:42:32 +0000 (10:42 +0100)
committer Barrucadu <mike@barrucadu.co.uk>
Mon, 4 May 2009 09:42:32 +0000 (10:42 +0100)
diff --cc examples/configs/sampleconfig
Simple merge
diff --cc examples/configs/sampleconfig-dev
Simple merge
diff --cc uzbl.c
Simple merge
author	Barrucadu <mike@barrucadu.co.uk>
	Mon, 4 May 2009 09:42:32 +0000 (10:42 +0100)
committer	Barrucadu <mike@barrucadu.co.uk>
	Mon, 4 May 2009 09:42:32 +0000 (10:42 +0100)
		1	2
examples/configs/sampleconfig	patch \|	diff1 \|	diff2 \|	blob \| history
examples/configs/sampleconfig-dev	patch \|	diff1 \|	diff2 \|	blob \| history
uzbl.c	patch \|	diff1 \|	diff2 \|	blob \| history