Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 30 Dec 2007 19:49:54 +0000 (14:49 -0500)
committerJoey Hess <joey@kitenet.net>
Sun, 30 Dec 2007 19:49:54 +0000 (14:49 -0500)
commitd65b39fdcbd9e585f8149998fc7c95f8c0079d37
treea1ddb93c5a6f097e619186920d783eee2c89bb84
parentf0f52e602df1e681aa6ce18fa3976120a6c5cb56
parentaf7ee3e521ffb4d121315a3a966fb87e468f6ee8
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info