From: Keith Packard <keithp@keithp.com>
Date: Sat, 13 Apr 2013 17:51:04 +0000 (-0700)
Subject: Merge branch 'master' into droid-gps
X-Git-Tag: altosdroid_v1.2-1~9^2~17
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=2f7015afcca7c6042365d2124d3a5b7219e8e588

Merge branch 'master' into droid-gps
---

2f7015afcca7c6042365d2124d3a5b7219e8e588