From: Bdale Garbee <bdale@gag.com>
Date: Tue, 17 May 2016 20:12:58 +0000 (-0600)
Subject: Merge branch 'upstream' into doc-orig
X-Git-Tag: non-free/1.29-1~1^2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=refs%2Fheads%2Fdoc-orig;p=debian%2Ftar

Merge branch 'upstream' into doc-orig
---

2786790d4828f036e8f9d88a4493f6a238e48f37