Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 8 May 2008 19:51:41 +0000 (15:51 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 8 May 2008 19:51:41 +0000 (15:51 -0400)
commit879f3a9403ca92b50de08db21dd9c337d4c583f3
treea17691cded962edf6fa24b7c760f3afbe57955e4
parentb8d81b7b7f53b8fac5632747eae73c7158e32fde
parent2bf34f1733668603f710c2410cbd09f8137ebf14
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info