From: Bdale Garbee <bdale@gag.com>
Date: Thu, 16 Jul 2015 19:36:59 +0000 (-0600)
Subject: Merge branch 'branch-1.6' into debian
X-Git-Tag: debian/1.6.1-1~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=f4f0f044df1251d64d44bf62d25b488fd04a05c8

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

f4f0f044df1251d64d44bf62d25b488fd04a05c8