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)
commit8172893ece7dfa04829f0f67881217f5f5f20d90
tree7b07a2c4c2bbb76175cf2f22e8f78c91844ff0e6
parent3236b5fe83bda79e16e43701e495ce086871fcf1
parentb591f5291b4891a05c3e59d36a757ffce0241531
Merge branch 'dfsg-orig' into dfsg-debian