Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Sun, 28 Dec 2014 18:32:39 +0000 (14:32 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sun, 28 Dec 2014 18:32:39 +0000 (14:32 -0400)
commit1d6dec40ebde1afa81aec05a68dc5649782c4b1f
treef099156413d1733db218cc687d9639db93ca637f
parent9f62caaff7676ee87d7ab348064a8f8a93f488ac
parenta87f43d71eccc6c71bd0dadcc1fe06ec809cfdcf
Merge branch 'master' of ssh://git.ikiwiki.info