Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 4 Sep 2008 03:41:11 +0000 (23:41 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 4 Sep 2008 03:41:11 +0000 (23:41 -0400)
commit73fe8e604878b84de739444ee8fbebb758fb5b14
tree7f0645ff1fa1e0ced39ec61fef63fbd64395825e
parent3c022e2cd755508391cc866c11b146f0edf43762
parent81211d2e75f43025d677f0d74cacb02989a4903d
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info