Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sat, 21 Nov 2015 17:37:36 +0000 (13:37 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 21 Nov 2015 17:37:36 +0000 (13:37 -0400)

Trivial merge