Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 24 Aug 2011 19:51:28 +0000 (15:51 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 24 Aug 2011 19:51:28 +0000 (15:51 -0400)
commite92f292525c615daf98c3bcf6a10a252bc77ebaa
tree727e907a519f59ee6e20ad72a13b197e19de795e
parent26d9a24fde920429add603b9d893787c41903477
parent6664b620b6bee884f247ce3025a69a1bc436ea99
Merge branch 'master' of ssh://git.ikiwiki.info