From: Bdale Garbee <bdale@gag.com>
Date: Thu, 13 Sep 2012 03:29:17 +0000 (-0600)
Subject: Merge branch 'branch-1.1' into debian
X-Git-Tag: debian/1.1-1~4
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=e91cb50e2a3a139ac7a0e09bffe569c7c1fa4381

Merge branch 'branch-1.1' into debian
---

e91cb50e2a3a139ac7a0e09bffe569c7c1fa4381