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)
commitcda5bf32a062c3da43913099f170f0987d780fdf
treee4504bbfee860201d2fc01948559c0cf6e441999
parent3aafbd66a0fa7396af0e2ed3f422c4de268ed4fe
parent07d2725d8cedff36e191d10f93286597883b54ff
Merge branch 'dfsg-orig' into dfsg-debian