Merge branch 'master' of git+ssh://git.err.no/srv/git.err.no/www/eweouz

author Tollef Fog Heen <tfheen@err.no>

Tue, 2 Sep 2008 21:48:01 +0000 (23:48 +0200)

committer Tollef Fog Heen <tfheen@err.no>

Tue, 2 Sep 2008 21:48:01 +0000 (23:48 +0200)
author Tollef Fog Heen <tfheen@err.no>
Tue, 2 Sep 2008 21:48:01 +0000 (23:48 +0200)
committer Tollef Fog Heen <tfheen@err.no>
Tue, 2 Sep 2008 21:48:01 +0000 (23:48 +0200)
diff --cc README
Simple merge
diff --cc lisp/eweouz.el
Simple merge
author	Tollef Fog Heen <tfheen@err.no>
	Tue, 2 Sep 2008 21:48:01 +0000 (23:48 +0200)
committer	Tollef Fog Heen <tfheen@err.no>
	Tue, 2 Sep 2008 21:48:01 +0000 (23:48 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/eweouz.el	patch \|	diff1 \|	diff2 \|	blob \| history