From: tsteven4 <tsteven4@gmail.com>
Date: Sun, 7 Feb 2016 21:07:57 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~9^2~32^2~2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b7b0371e299d1f496ad7b3c88fd3ed78f3229ece;p=gpsbabel.git

Merge remote-tracking branch 'upstream/master'
---

b7b0371e299d1f496ad7b3c88fd3ed78f3229ece