From: Bdale Garbee <bdale@gag.com>
Date: Tue, 5 Jul 2016 08:25:48 +0000 (+0200)
Subject: Merge branch 'branch-1.6' into debian
X-Git-Tag: debian/1.6.8-1~4
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=7d1d1759a0b9dfa1ab95ff0c217c5d921452b920;p=fw%2Faltos

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

7d1d1759a0b9dfa1ab95ff0c217c5d921452b920