Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 24 Feb 2008 21:40:34 +0000 (16:40 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 24 Feb 2008 21:40:34 +0000 (16:40 -0500)
commitd4c7b44ea0cb77b40ffcd0a65d2d6caab0a69e09
tree8a674a6faae52c66105e1cf240cfe1689ae23ddd
parentbd55d276b3367e2c1792ea868d6e868cc26e2203
parent012fcf781a13b8abb623101310620ad68f397c3d
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info