Merge remote-tracking branch 'origin/pr/752' into wh_low_speed_limit
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 24 Mar 2015 06:37:18 +0000 (07:37 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 24 Mar 2015 06:37:18 +0000 (07:37 +0100)
commit5b1d67d04e490d48dd72dbb9f84d1a74bfb9dcc1
tree6bc6f156aeba581bbc3d31ad99013bc5c3e349dc
parentf03005bd330f0c060025aef8b6fcac1bc55a3ca5
parentfc1c7d7583eefd8fc3f2740015e5665dffe3e7c9
Merge remote-tracking branch 'origin/pr/752' into wh_low_speed_limit

Conflicts:
src/write_http.c

Also slipped in a couple of conding-style consistentcy related changes.
src/collectd.conf.pod
src/write_http.c