Merge branch 'branch-1.8' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 19 Sep 2017 02:46:47 +0000 (20:46 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 19 Sep 2017 02:46:47 +0000 (20:46 -0600)
1  2 
.gitignore

diff --cc .gitignore
Simple merge