From: Bdale Garbee <bdale@gag.com>
Date: Fri, 17 Jun 2016 16:02:00 +0000 (-0600)
Subject: Merge branch 'branch-1.6' into debian
X-Git-Tag: debian/1.6.4-1~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=085336c45ce0577031a7af5de117a8b856160708

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

085336c45ce0577031a7af5de117a8b856160708