Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 15 Jun 2008 21:33:41 +0000 (17:33 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 15 Jun 2008 21:33:41 +0000 (17:33 -0400)
commiteab612e3d424f272db5aa4a3352396e88dbbc35a
treeed8875c838c17c7d6791c99103362aeec17c0560
parentb4caecc2ba1ed99b0cead8277d30a59eef94de7a
parent524c21ffbd667a525f0ce342d5bf7f0126c4efa9
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info