Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Mar 2010 16:18:09 +0000 (12:18 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Mar 2010 16:18:09 +0000 (12:18 -0400)
commitb0411319009237c4aea48de78945388d019fc21c
tree9e91bbd8b9423c25ea1fd2a5937628a77e5869dd
parent97898ce585b36dbcb0a83356ef3e54c41d369437
parent263d9548969dcdf9a6add96f46fe03ba7701a1ca
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:
doc/todo/allow_site-wide_meta_definitions.mdwn
doc/todo/allow_site-wide_meta_definitions.mdwn