Code

Merge remote-tracking branch 'origin/pr/1346'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 9 Aug 2016 11:14:04 +0000 (13:14 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 9 Aug 2016 11:14:04 +0000 (13:14 +0200)
commit1bdfcf9791729310f75857d0e002c40ef659a89b
tree486f6e6f87fbca1ae986f8a208909280a719482c
parent7a65aadcc432d3341f5cca816c6a157b1b9d6116
parent7c14b05db2cd7b17321f1e37bfb852c1a9a3832d
Merge remote-tracking branch 'origin/pr/1346'

 Conflicts:
README
configure.ac
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod
src/types.db
AUTHORS
README
configure.ac
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod
src/gps.c
src/types.db