Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 17 Apr 2008 18:38:16 +0000 (14:38 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 17 Apr 2008 18:38:16 +0000 (14:38 -0400)
commit81355cd4c6868358ea2828334406c9b6cd572b5f
treec768983c1f15579716067110eed6e7f936a3a86f
parentf1228946bd62b7b4528bccabe91f836a16912e28
parent143c8770d13698a9fabf9d7ac86a268a286033da
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info