Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Thu, 19 Nov 2015 22:49:01 +0000 (18:49 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 19 Nov 2015 22:49:01 +0000 (18:49 -0400)

Trivial merge