Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 30 Sep 2009 19:40:15 +0000 (15:40 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 30 Sep 2009 19:40:15 +0000 (15:40 -0400)
commit54f352bb74d3531b1c7ec4d8c7c5c1d5d1eabc65
treecee1d662371d76819a9c7bcb99d06f6bb1afaf62
parente04e9ccea930aefb3b1dbeb8203dce8c6f8bef13
parent0159612ee0b3c18c9b1aca6245d6c97e9af14a24
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info