Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 16 Oct 2008 22:20:41 +0000 (18:20 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 16 Oct 2008 22:20:41 +0000 (18:20 -0400)
commita80da69cc358b69278005f65dd86aa5a9fbb64cf
treeb4bdb6a268090a57e1ebdbeeade459221bebbf7b
parentf36080ae026d630c180e4a73709d09ca779a0c2e
parentc2a55bd735bf2978cc4b998847394a1853b8678f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info