From: Bdale Garbee <bdale@gag.com>
Date: Sun, 8 Feb 2015 05:39:54 +0000 (-0700)
Subject: Merge branch 'branch-1.6' into debian
X-Git-Tag: debian/1.6-1~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=f766a457323268857b3f2dfc7f42427437b71cb7

Merge branch 'branch-1.6' into debian

Conflicts:
	ChangeLog
	altoslib/AltosTelemetryReader.java
	configure.ac
---

f766a457323268857b3f2dfc7f42427437b71cb7