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

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

28d7fe977b17a861a8197c1412915a24978db38e