Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 5 Jul 2016 08:25:48 +0000 (10:25 +0200)
committerBdale Garbee <bdale@gag.com>
Tue, 5 Jul 2016 08:25:48 +0000 (10:25 +0200)

Trivial merge