Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 6 Nov 2007 00:33:56 +0000 (19:33 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 6 Nov 2007 00:33:56 +0000 (19:33 -0500)
commitc1e4bed9d6c57c6c8fd08712ba20f303980b1e69
tree01c96352549d8338f358f4fbda2b694c3c1e434e
parent1c9946ff484f46cdbd3fd2c9dababbbb2a95ed63
parent7fad6c0cfb9e33e0f0456aeeb490ebde300001b4
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info