Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 16 Jul 2015 19:36:59 +0000 (13:36 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 16 Jul 2015 19:36:59 +0000 (13:36 -0600)

Trivial merge