Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 4 Feb 2008 22:59:07 +0000 (17:59 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 4 Feb 2008 22:59:07 +0000 (17:59 -0500)
commitb224b2554402620faaaa5cf22f6f36169672497a
treee40aa5cb3a213665682e5b800b0fcdf4941b1afd
parentd1c4899a22c99febfd46d6f2e28803ecf5d7288f
parent2eba6f2138ded82d18af5aca4b290159a72b2c39
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info