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

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

8eef2606520e8f1c67ecebb8671091dd71c0ca30