Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 10 Jun 2011 22:48:22 +0000 (18:48 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 10 Jun 2011 22:48:22 +0000 (18:48 -0400)
commitd86f248329b1702c5093e0bd8274c3bd3f059ba8
tree2f8ace91d2ed210519cbb70a4bcc4d41da326ba3
parent8e15f664c4f3c9260c771fee52f6f5ae20ccdddf
parent79e1bbd3cc641fe26df4094456575ee920c93f74
Merge branch 'master' of ssh://git.ikiwiki.info