Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 14 May 2012 18:14:39 +0000 (14:14 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 14 May 2012 18:14:39 +0000 (14:14 -0400)
commit95a8b8868f1bbf73a9b8a4f36c5e21c2fcd0141b
tree11739ba9e8a09c85c82a3e883663ac1f937d899c
parenta69c25fde0201de1addf44a55c2e6cd5334f50ea
parentdd3703884047e7de53f6394d2b2fa8ba80fbac9d
Merge branch 'master' of ssh://git.ikiwiki.info