From: Bdale Garbee <bdale@gag.com>
Date: Tue, 6 Sep 2016 03:01:35 +0000 (-0600)
Subject: Merge branch 'branch-1.6' into debian
X-Git-Tag: debian/1.6.8-1~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6af87e5cf98e644d2455faf6526a9f11880686f5

Merge branch 'branch-1.6' into debian
---

6af87e5cf98e644d2455faf6526a9f11880686f5