Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Sep 2009 18:44:52 +0000 (14:44 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Sep 2009 18:44:52 +0000 (14:44 -0400)
commit55fd6e4ecb850c1bed962801a54dd3fc7eb0b4b7
tree3ba56a35553c181540f5a11307fb80369a9ef2cb
parent412a4dd62ade18f5e057ff3324321188245a542e
parente8bdd1e22f8d322456ca6a6928fc7049e3fd0007
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info