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)
commit3bfdc14c713fb2b9c9ad0c9e9e87e32dee5fd165
tree8ac534de7f2ef626b9a89963000645c7a7dab476
parent0b73fcaabb5e614d1e7f539d1a55c78bee45bb7f
parent34b42e86af9d37c366a44280d2ba06ad2e2971df
Merge branch 'dfsg-orig' into dfsg-debian