Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 30 Jan 2008 06:38:59 +0000 (01:38 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 30 Jan 2008 06:38:59 +0000 (01:38 -0500)
commitddfa16145ac4c9938606104b685b382e2acd2f05
treedd3156c26f5edd8c741b04fab31263100dfc2a03
parent4d1a794c3fd2116b2755877f73d6874db6c03083
parentd758d326042ee3f2b44d899dc78158c99f901c3f
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info