Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 28 May 2008 19:38:36 +0000 (15:38 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 28 May 2008 19:38:36 +0000 (15:38 -0400)
commit774a5f86b2fa8dcbc561c50901cf655711e836dc
treeb3f501ebb0d555ff1a3fe0b315ac140087700cf5
parentd5d56a24bd49142f8d387adce6c8ca5292af1874
parentc928a118d6250f51effdbf2682d44d2d09eeb21d
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info