Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 10 Apr 2008 20:35:50 +0000 (16:35 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 10 Apr 2008 20:35:50 +0000 (16:35 -0400)
commit243739e1c355da4162dc1b41c04c11cc1fb676c0
treea31102f366088c703a0115f27ef48750613b2679
parent72b5ef2c5fb01751992c9400afe2690da5df611f
parentc69c811d64b285cec3dc3039376c2ff8c8907121
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info