Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

author Joey Hess <joey@kitenet.net>

Wed, 21 Apr 2010 20:34:50 +0000 (16:34 -0400)

committer Joey Hess <joey@kitenet.net>

Wed, 21 Apr 2010 20:34:50 +0000 (16:34 -0400)
author Joey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 20:34:50 +0000 (16:34 -0400)
committer Joey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 20:34:50 +0000 (16:34 -0400)
diff --cc doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
Simple merge
author	Joey Hess <joey@kitenet.net>
	Wed, 21 Apr 2010 20:34:50 +0000 (16:34 -0400)
committer	Joey Hess <joey@kitenet.net>
	Wed, 21 Apr 2010 20:34:50 +0000 (16:34 -0400)