Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 2 Oct 2009 18:06:55 +0000 (14:06 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 2 Oct 2009 18:06:55 +0000 (14:06 -0400)
commit547bbebcbc81d13d79eeb72e9c1bf7f95f514835
treecf5f601a7cad3b700373883016036299dbef6986
parent1c5a9c0cc8265a6a552b1500eb3a3d2aa17b9720
parentb9b06d9303179833129adb3c93cc97d13188b3d2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info