Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 4 Dec 2015 22:05:18 +0000 (18:05 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 4 Dec 2015 22:05:18 +0000 (18:05 -0400)

Trivial merge