Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 9 Jan 2008 02:01:54 +0000 (21:01 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 9 Jan 2008 02:01:54 +0000 (21:01 -0500)
commitdc16e386819da912a5fa37214a0d1335cc4d97f5
tree843146a6f445accef977459868a313d06f17e7c0
parent13cf99822d6f89ed181de468c180e7ee5c723f5c
parentd21467601cf37d99911350e2dffb0f80388be92d
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info