Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 00:00:38 +0000 (19:00 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 00:00:38 +0000 (19:00 -0500)
commit62c0ba3619056cfb67edf426f7f5db59d6d56bb9
treeb82b42f3f210069ee0e96cfeacff31e24020ac14
parent09af90e7753267884618e435cba3465916256e09
parent143c4371068d9a019fa7556c5ef9ee2696e3b678
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info