Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 25 Sep 2009 21:03:21 +0000 (17:03 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 25 Sep 2009 21:03:21 +0000 (17:03 -0400)
commit1c044400184648cbb511b796ad0499e53b21d084
tree5dcebefbc1093df6ab0c14693f34e4718ac616dd
parent9d96253d2b10f5bf56b7bd64635754508d969cb6
parentbe47e501c32cec7660129f430a4f93ee7fe8d3ff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info