Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 11 Feb 2008 03:54:17 +0000 (22:54 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 11 Feb 2008 03:54:17 +0000 (22:54 -0500)
commitccc5b496e34a58a834a4402586958659c7d4e40f
tree3edfb10bac5cd6bd74a5facdd2211c0150e45ffe
parent129d924c0ecb73a14bd343ba083e53f3a942ce65
parent4c0cc8e3a72a2f4bc00ee5dd88683ca562b7df5f
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info