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

Trivial merge