From: Tomas <tomasamot@gmail.com>
Date: Wed, 6 Aug 2014 11:02:20 +0000 (+0200)
Subject: Merge branch 'barometer_bmp085' of github.com:tmtom/collectd into barometer_bmp085
X-Git-Tag: collectd-5.5.0~58^2~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3b5316b9b766e13c3e6212dcc9781e290a32987f;p=collectd.git

Merge branch 'barometer_bmp085' of github.com:tmtom/collectd into barometer_bmp085
---

3b5316b9b766e13c3e6212dcc9781e290a32987f