Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 12 May 2008 21:07:53 +0000 (17:07 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 12 May 2008 21:07:53 +0000 (17:07 -0400)
commit328ad8bf0d2b3ac7c20d0079fcc5286685825d88
tree4cd4720e1ec998204374d4cd73d1f94887a785d9
parent30746d12a5e88e9324f8506cd1eafab1694ba651
parent908375a63e6aa083ca4b6348e7f22482ab208f12
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info