Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 28 Aug 2008 17:05:33 +0000 (13:05 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 28 Aug 2008 17:05:33 +0000 (13:05 -0400)
commita4d033691ab8d00f4217e49dad35474be4763d1e
tree76832b1d3182ebe8eec81c6b920b81cf4b098a7c
parent2b602e2e9f06c79e969ae2e2fea64052edd82e6b
parent592aa33d28cedc91a0ced418262301f518228b32
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info