Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Sun, 8 Feb 2015 05:39:54 +0000 (22:39 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 8 Feb 2015 05:39:54 +0000 (22:39 -0700)
commitf766a457323268857b3f2dfc7f42427437b71cb7
tree8afc8a661d682fc34b16fc0b1b44f2844d34f336
parentdb51224af01731e7323f6f696a7397d64eb80b92
parente2cefd8593d269ce603aaf33f4a53a5c2dcb3350
Merge branch 'branch-1.6' into debian

Conflicts:
ChangeLog
altoslib/AltosTelemetryReader.java
configure.ac