Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 11 Nov 2015 19:08:57 +0000 (15:08 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 11 Nov 2015 19:08:57 +0000 (15:08 -0400)

Trivial merge