Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Sun, 16 Aug 2015 15:55:47 +0000 (17:55 +0200)
committerBdale Garbee <bdale@gag.com>
Sun, 16 Aug 2015 15:55:47 +0000 (17:55 +0200)

Trivial merge