Merge branch 'dfsg-orig' into dfsg-debian
authorBdale Garbee <bdale@gag.com>
Fri, 22 Jul 2016 19:42:43 +0000 (13:42 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 22 Jul 2016 19:42:43 +0000 (13:42 -0600)

Trivial merge