Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 7 Nov 2007 21:59:44 +0000 (16:59 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 7 Nov 2007 21:59:44 +0000 (16:59 -0500)
commit2ed67f7fe7290aa39144d0289bf7205cd421d386
treef344b95f1fa88df3a45e584d11a143449500d3cb
parent930584cff747d87635da192585030d4fb30a2893
parent049a7853c59d2f48d7c59070a1d3c7b66ef15127
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info