Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 31 Oct 2007 02:51:29 +0000 (22:51 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 31 Oct 2007 02:51:29 +0000 (22:51 -0400)
commit848af1f9060935e9aec4b3e843e8055bb8707140
treeb7e31cdb2563a4f085fdb4329f9a91b0aaed90fa
parent5cbd86235e7993cc067b76105b9ed2e4fbdda3a1
parent00259020061577316895370ee04cf00b634db98a
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info