Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 14 Sep 2013 20:24:29 +0000 (16:24 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 14 Sep 2013 20:24:29 +0000 (16:24 -0400)
commit8e6274a2bd4f7b6f7398f3a489e37a2f1c85dbb2
tree503f95852f1f39da20e7f0819937f2950c2a0a30
parent211635bb1bee4a941339446b636e7244fb15fbcf
parent62c93e3dd950358d17dcd6c57623d8aea4856c14
Merge branch 'master' of ssh://git.ikiwiki.info