From: Bdale Garbee <bdale@gag.com>
Date: Wed, 19 Aug 2009 00:37:10 +0000 (-0600)
Subject: Merge branch 'master' into debian
X-Git-Tag: debian/1.1-1~16
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=79501a5462ab29d661cf76f63628bd4616b6ae1b;p=fw%2Faltos

Merge branch 'master' into debian
---

79501a5462ab29d661cf76f63628bd4616b6ae1b