Merge branch 'master' of git://github.com/joeyh/ikiwiki

author Amitai Schlair <schmonz@magnetic-babysitter.(none)>

Sun, 30 Aug 2009 07:02:15 +0000 (03:02 -0400)

committer Amitai Schlair <schmonz@magnetic-babysitter.(none)>

Sun, 30 Aug 2009 07:02:15 +0000 (03:02 -0400)
author Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Sun, 30 Aug 2009 07:02:15 +0000 (03:02 -0400)
committer Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Sun, 30 Aug 2009 07:02:15 +0000 (03:02 -0400)
diff --cc IkiWiki.pm
Simple merge
diff --cc IkiWiki/Render.pm
Simple merge
author	Amitai Schlair <schmonz@magnetic-babysitter.(none)>
	Sun, 30 Aug 2009 07:02:15 +0000 (03:02 -0400)
committer	Amitai Schlair <schmonz@magnetic-babysitter.(none)>
	Sun, 30 Aug 2009 07:02:15 +0000 (03:02 -0400)
		1	2
IkiWiki.pm	patch \|	diff1 \|	diff2 \|	blob \| history
IkiWiki/Render.pm	patch \|	diff1 \|	diff2 \|	blob \| history