From: Keith Packard <keithp@keithp.com>
Date: Sat, 17 Aug 2013 15:33:31 +0000 (+0200)
Subject: Merge branch 'master' into telegps-v0.3
X-Git-Tag: 1.2.9.4~142
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=f0e126251360f050b7121f167771c057bda8747e

Merge branch 'master' into telegps-v0.3
---

f0e126251360f050b7121f167771c057bda8747e