Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 10 Nov 2015 20:53:06 +0000 (16:53 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 10 Nov 2015 20:53:06 +0000 (16:53 -0400)

Trivial merge