Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Apr 2008 21:12:40 +0000 (17:12 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Apr 2008 21:12:40 +0000 (17:12 -0400)
commitd17e1d8c9d124cbf92f356871124ff76ff88621a
tree4d4be1004218c3e3078b61a812a6e0504c58cb2b
parent14b59caba35eada4427223f16cd98e7fc0cb3253
parent57035d610e9446e9a50b6807be2bb33d182c4c3b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info