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

Trivial merge