Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 2 Dec 2015 16:33:08 +0000 (12:33 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 2 Dec 2015 16:33:08 +0000 (12:33 -0400)

Trivial merge