From: Bdale Garbee <bdale@gag.com>
Date: Sat, 17 Aug 2013 14:04:36 +0000 (+0200)
Subject: Merge branch 'branch-1.2' into debian
X-Git-Tag: debian/1.2.1-3~3
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=c2dc65bca190afaee2bea7eefc3ce2f77cf85945;p=fw%2Faltos

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

c2dc65bca190afaee2bea7eefc3ce2f77cf85945