From: Bdale Garbee <bdale@gag.com>
Date: Wed, 10 Sep 2014 06:05:33 +0000 (-0600)
Subject: Merge branch 'branch-1.5' into debian
X-Git-Tag: debian/1.5-1~7
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=4d0604fb0b3c1cfd43f6815d4549ae8d5d74039b;hp=-c;p=fw%2Faltos

Merge branch 'branch-1.5' into debian
---

4d0604fb0b3c1cfd43f6815d4549ae8d5d74039b