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

Trivial merge