Merge branch 'dfsg-orig' into dfsg-debian
authorBdale Garbee <bdale@gag.com>
Tue, 17 May 2016 18:37:49 +0000 (12:37 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 17 May 2016 18:37:49 +0000 (12:37 -0600)

Trivial merge