Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 18 May 2013 20:27:35 +0000 (16:27 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 18 May 2013 20:27:35 +0000 (16:27 -0400)
commit239c37989d4fb3e94c4c6db841a49a79b9ea040f
tree9632cd7d709db1aba147b82e76fd77b2b9827ca8
parent9e4f0efe44a11ee5d30ce077a8f259d2ecc5b781
parentc4c9c3683b449107b04b1cd0b07064d2f38985db
Merge branch 'master' of ssh://git.ikiwiki.info