Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 14 Sep 2013 16:06:43 +0000 (12:06 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 14 Sep 2013 16:06:43 +0000 (12:06 -0400)
commit211635bb1bee4a941339446b636e7244fb15fbcf
tree92b31824c42a03872dee9287612e99ac5dd75ea0
parentba0e2a5d17285aac9cd46af62ffa7eedb5b6254e
parent8bc02b1a10950c3bbb19757aa7368a94017dab54
Merge branch 'master' of ssh://git.ikiwiki.info