Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 22 Dec 2007 18:36:24 +0000 (13:36 -0500)
committerJoey Hess <joey@kitenet.net>
Sat, 22 Dec 2007 18:36:24 +0000 (13:36 -0500)
commit0e4da6b73b5c274b3fc832d5a602c6363efbcbad
treeab3fb0e19bd88da36bda9bb3ac07c49abdf7ae2f
parentc10b9ca3be52b8f9c18fc474163151bfafdbab68
parent01fb89bcd4d5e28ced28383aeb6a7720efdaa12b
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info