Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 26 Mar 2009 18:04:42 +0000 (14:04 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 26 Mar 2009 18:04:42 +0000 (14:04 -0400)
commitde116df11bae9ad04a23bad2031357cf39a4d039
treeba136802a462e8f795e6498ebfcbefec69f1ab22
parent503d83ffbc358714ad84e46ce523b8702268edb6
parent20071c39458b841ed9c1e4cb4e7844358e98016a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info