Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 24 Jun 2010 00:30:47 +0000 (20:30 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 24 Jun 2010 00:30:47 +0000 (20:30 -0400)
commitbd7221ae5450e14e9641e01e0c2890a8f018ddb4
tree6196c1f4824f06ddfcd5502c41406f101384f794
parent38bf2f6388d506e741395992617a900843e9ba0d
parente32bce464305fd8314d8324169a2079516548faf
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info