Merge branch 'dfsg-orig' into dfsg-debian
authorBdale Garbee <bdale@gag.com>
Tue, 4 Feb 2014 01:05:44 +0000 (18:05 -0700)
committerBdale Garbee <bdale@gag.com>
Tue, 4 Feb 2014 01:05:44 +0000 (18:05 -0700)

Trivial merge