Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 23 Jan 2009 21:54:13 +0000 (16:54 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 23 Jan 2009 21:54:13 +0000 (16:54 -0500)
commita471ac68c8332cdee765896581db91c90b5a19e2
treed375d48e6ce152f318d2a1e52b64b99d4b9bb7d9
parent1c369f144098be90a63033237d75b3e7c9656ea9
parent54265c655c4ac3ef0899668827a8f757381087bd
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info