From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 16 Dec 2015 17:07:46 +0000 (-0400)
Subject: Merge branch 'master' into smudge
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~320^2~184^2~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=029111b89a7aec02643d61861771a1c9baa3ee81;p=git-annex.git

Merge branch 'master' into smudge
---

029111b89a7aec02643d61861771a1c9baa3ee81