From: Bdale Garbee <bdale@gag.com>
Date: Tue, 21 May 2013 18:52:26 +0000 (-0600)
Subject: Merge branch 'branch-1.2' into debian
X-Git-Tag: debian/1.2.1-2~4
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=1478f05f6a4bdbab7a89005b2f76af9aaa41b3f7;hp=-c;p=fw%2Faltos

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

1478f05f6a4bdbab7a89005b2f76af9aaa41b3f7