Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Dec 2008 19:59:48 +0000 (14:59 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Dec 2008 19:59:48 +0000 (14:59 -0500)
commit82e6902a67ac5ad06a9174c240b7f521daa6c21e
treea85768163cec971edcf57df36b7a9d82498ff066
parentee598e42f61a6afc31f49551a60dff9534f77ee1
parent3032909090711c86c5056987043eeff5a1f6aec2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info