Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 15 Aug 2009 17:59:34 +0000 (13:59 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 15 Aug 2009 17:59:34 +0000 (13:59 -0400)
commit1f95a925f39e09e3ad916de6d90f317ae3c25281
treedfee967dde573b1d7317d99d0c27e3bf5b88db29
parentc258160725a79953f28f799b31959b73e4beac77
parentfdf30251334bfff4b03ed1bbdd85a8fd016e75a8
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info