From: Bdale Garbee <bdale@gag.com>
Date: Tue, 21 May 2013 15:31:48 +0000 (-0600)
Subject: Merge branch 'branch-1.2' of ssh://git.gag.com/scm/git/fw/altos into branch-1.2
X-Git-Tag: 1.2.1~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=5a329c7f588334df7443b47c8f478ebadf312f62;p=fw%2Faltos

Merge branch 'branch-1.2' of ssh://git.gag.com/scm/git/fw/altos into branch-1.2
---

5a329c7f588334df7443b47c8f478ebadf312f62