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

Merge branch 'master' into smudge
---

c608a752a51bace25749dc0a9a5401bf62506001