Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 18 Nov 2007 22:24:01 +0000 (17:24 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 18 Nov 2007 22:24:01 +0000 (17:24 -0500)
commit9f1e4994963d489fbc409555b4cfda33383cfe74
tree1865e0775b50b9d73c14020ce8a7b38f847eb090
parente016a975c48175f7dbe2c5cb3f9f8b0b019ac33a
parent4e7abae23b6bd10dd9275af02203b33d43ea4129
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info