Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 2 Jan 2009 19:16:13 +0000 (14:16 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 2 Jan 2009 19:16:13 +0000 (14:16 -0500)
commit42c91cab61f3881dc758180ace5b7627809728ed
treeb8ba0d7221b2690301aa5ecc54f6787197824cc1
parent3428cdd9d5b4f9e537df39d971187ee1ffd9c2fb
parentba47fe42465b1e1bc5bef7f82ceeac8f3feee696
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info