Merge branch 'branch-1.7' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 25 Apr 2017 00:22:03 +0000 (18:22 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 25 Apr 2017 00:22:03 +0000 (18:22 -0600)
commitb91f67005709cb7f65e0a461b49b5cb0952cb391
treee9f6c0f30a81cf30a9cfd52887171168f7830f85
parent1e956f93e0c9f8ed6180490f80e8aead5538f818
parent8a10ddb0bca7d6f6aa4aedda171899abd165fd74
Merge branch 'branch-1.7' into debian