Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 10 Jun 2009 17:59:31 +0000 (13:59 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 10 Jun 2009 17:59:31 +0000 (13:59 -0400)
commit04aff6702b1e00ad968df6b90f3eca4eca02371c
treee85b0f324a8f53071aed52cd44212eb600d5e966
parentdd15cc426f75b4277ae0dbbfee221fe278245d54
parent31bb5268973534d5262bf301864f033f60db39c7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info