From: Bdale Garbee <bdale@gag.com>
Date: Thu, 16 May 2013 06:36:23 +0000 (-0600)
Subject: Merge branch 'branch-1.2' into debian
X-Git-Tag: debian/1.2.1-1~8
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=02d111b1b53ef01fc6e9ab6c4bc60b8af1be0067

Merge branch 'branch-1.2' into debian
---

02d111b1b53ef01fc6e9ab6c4bc60b8af1be0067