From: Bdale Garbee <bdale@gag.com>
Date: Sun, 16 Sep 2012 20:01:51 +0000 (-0600)
Subject: Merge branch 'branch-1.1' into debian
X-Git-Tag: debian/1.1.1-1~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=7cd8bf294ce0c9913977e54ea48c0928df7ddfcd

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

7cd8bf294ce0c9913977e54ea48c0928df7ddfcd