From: Bdale Garbee <bdale@gag.com>
Date: Wed, 25 Jun 2014 03:31:53 +0000 (-0600)
Subject: Merge branch 'branch-1.4' of ssh://git.gag.com/scm/git/fw/altos into branch-1.4
X-Git-Tag: 1.4.1~2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=6986da4407ac53e267b95abb1848211ea9d32b41;p=fw%2Faltos

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

6986da4407ac53e267b95abb1848211ea9d32b41