Merge branch 'dfsg-orig' into dfsg-debian
authorBdale Garbee <bdale@gag.com>
Sun, 23 Aug 2015 17:56:39 +0000 (19:56 +0200)
committerBdale Garbee <bdale@gag.com>
Sun, 23 Aug 2015 17:56:39 +0000 (19:56 +0200)

Trivial merge