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

Trivial merge