Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 25 Aug 2008 20:04:18 +0000 (16:04 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 25 Aug 2008 20:04:18 +0000 (16:04 -0400)
commit3cb1c8fa3b1fac58f8a84deef9b72b334c17c97a
treecf1f8d2fe8701a266713ccff2ac346a74cdd20af
parent03765e037dd9096648dc7f262e8164449347b092
parentb8cae5f7b822fff5239ff3ca742e7cf9f3767db3
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info