From: Bdale Garbee <bdale@gag.com>
Date: Mon, 4 Jul 2016 21:48:32 +0000 (+0200)
Subject: Merge branch 'branch-1.6' into debian
X-Git-Tag: debian/1.6.5-1~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=06c3d5420080bc1c6fdfb213a9d616b75611c159;p=fw%2Faltos

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

06c3d5420080bc1c6fdfb213a9d616b75611c159