Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 26 Feb 2009 07:31:24 +0000 (02:31 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 26 Feb 2009 07:31:24 +0000 (02:31 -0500)
commit4efc5e7b5ab4d3aa8c7576c7dd3970b2548f85c6
tree51c9b6f25d282491615f20961f5b4e7971cd0185
parentb30c1b0c38bc8e6730a76135e6bff695d0f778c2
parent192f042e3a909edb01719da6f9943fcb588e81e6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info