Merge branch 'master' into autotag

author Joey Hess <joey@kitenet.net>

Tue, 20 Apr 2010 22:19:00 +0000 (18:19 -0400)

committer Joey Hess <joey@kitenet.net>

Tue, 20 Apr 2010 22:19:00 +0000 (18:19 -0400)
author Joey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 22:19:00 +0000 (18:19 -0400)
committer Joey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 22:19:00 +0000 (18:19 -0400)
diff --cc IkiWiki.pm
Simple merge
diff --cc IkiWiki/Render.pm
Simple merge
author	Joey Hess <joey@kitenet.net>
	Tue, 20 Apr 2010 22:19:00 +0000 (18:19 -0400)
committer	Joey Hess <joey@kitenet.net>
	Tue, 20 Apr 2010 22:19:00 +0000 (18:19 -0400)
		1	2
IkiWiki.pm	patch \|	diff1 \|	diff2 \|	blob \| history
IkiWiki/Render.pm	patch \|	diff1 \|	diff2 \|	blob \| history