From: Bdale Garbee <bdale@gag.com>
Date: Tue, 21 May 2013 15:30:43 +0000 (-0600)
Subject: Merge branch 'branch-1.2' into debian
X-Git-Tag: debian/1.2.1-1~4
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=97b80e3fef28d367a5ed1d18893accd1416cdf3f

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

97b80e3fef28d367a5ed1d18893accd1416cdf3f