Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 26 Oct 2009 15:58:25 +0000 (11:58 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 26 Oct 2009 15:58:25 +0000 (11:58 -0400)
commita8a58a466cd787e4b75328b2e9d689168dd26ba8
tree8639582f5b415dc196010f940cc5bbc8d7bfeaa6
parenta2979b2b52eee47cc6d08274b5c6947aeaf9bfdc
parentb54b8215d0c150410e4a629caa9b0035d69f89b2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info