From: Bdale Garbee <bdale@gag.com>
Date: Sat, 7 May 2016 00:13:12 +0000 (-0600)
Subject: Merge branch 'branch-1.6' into debian
X-Git-Tag: debian/1.6.3-1~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=4c20fdfa543059739b756171b991d430789cded1;p=fw%2Faltos

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

4c20fdfa543059739b756171b991d430789cded1