Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 31 Oct 2008 22:00:58 +0000 (18:00 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 31 Oct 2008 22:00:58 +0000 (18:00 -0400)
commitac750fcd12f1375d4875d62a889005322aa6f534
tree313d7a38a699f990e00c3e49f26211718918ea54
parent936e016de99af36ea5518dc16af8f4927b2388ae
parentfd9192006b32498ab6c0badfb1806acb6ee893c8
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info