Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 12 Aug 2010 20:55:08 +0000 (16:55 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 12 Aug 2010 20:55:08 +0000 (16:55 -0400)
commit0099a9df8b2154d0b9ba62f6da4cd4bc926d1164
tree0a0f9a5aa0d6919aa57ec6f26191b381ee588d30
parent80102c042d0f2fd194222cd233a7bfd0e8bd467f
parent8853e4e79c725cc5a58bfc96c75785ae2f16b068
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info