Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 18 Dec 2015 18:43:12 +0000 (14:43 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 18 Dec 2015 18:43:12 +0000 (14:43 -0400)

Trivial merge