Merge branch 'dfsg-orig' into dfsg-debian
authorBdale Garbee <bdale@gag.com>
Tue, 15 Oct 2013 15:56:27 +0000 (09:56 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 15 Oct 2013 15:56:27 +0000 (09:56 -0600)
commite4faf46844fa3162def723f12a09791e350caabb
treefb0d93dfe12d4a82a49b14fc7a6e6d571c59a973
parentcda8f3799ea20b0d39223fbeb16e3b9a074a4ae6
parentc66233240e6c2e5262ac4e36fe4362f64cbfa9c4
Merge branch 'dfsg-orig' into dfsg-debian