Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 6 Sep 2016 03:01:35 +0000 (21:01 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 6 Sep 2016 03:01:35 +0000 (21:01 -0600)
commit6af87e5cf98e644d2455faf6526a9f11880686f5
treed23017ea0a0fd693cbef18979c35cfca7ce1db69
parent6ec9f2a78aa8c99d48006b14c936c59edd08addf
parent168c39a37415b1bdc09aa00bbaaafb5d879ce8bd
Merge branch 'branch-1.6' into debian