Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 20 Mar 2009 20:34:49 +0000 (16:34 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 20 Mar 2009 20:34:49 +0000 (16:34 -0400)
commitee973d0b460044769328b30067d1d7ca24a5a228
tree1b8e447cd3e3ce593743037cf2c27d78b524fa58
parenta2c0423e541006f5d1c0c99f4bb07aadfb0cc733
parent1d9b58b0d4efe4ad4f752eeda7e52b263edaec87
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info