Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 28 Nov 2008 16:53:35 +0000 (08:53 -0800)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 28 Nov 2008 16:53:35 +0000 (08:53 -0800)
commit93a43084d0257552b7a61d40e6b3ceda8624cc55
tree02be37b1123f3bb3e3e14afe433ba3caa38db408
parentc9646ac23c526f2c2d7c9eeb77ff4fdcd59dbee1
parent708ff7870dfb9ae9e3d289f886433b82e016b58f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info