Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 21:24:50 +0000 (17:24 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 21:24:50 +0000 (17:24 -0400)
commitf2b1a918b022863c6baf010bee3e57b5f08a794f
tree8987054d8e7872446e637b17a24707e1f09b8160
parent06de9da609bb79438729c686ca5721d0415b4894
parent8e77b66aaee796a05109e78c67f647b924e17363
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info