Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 7 Jan 2010 20:10:29 +0000 (15:10 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 7 Jan 2010 20:10:29 +0000 (15:10 -0500)
commitdb44ee6ed0bcadcda070a9fddc0e8ceb5a468527
treebbda5844d1c9027cedb73ac764b03b1a615f662f
parenta250a55baaf86c6c8ebc35f908a9fc2e3c7526b4
parent436e29731026194e961ed0f11e85517308a400d9
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info