Merge remote-tracking branch 'origin/collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 28 May 2015 18:21:55 +0000 (20:21 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 28 May 2015 18:21:55 +0000 (20:21 +0200)
commit9b43c4ca7442e7886c1fbe339ce57f297872269f
tree274d1579db2ea3bbc9526433255777f2692c7c8d
parent35dfbf6616169e6f0fddb2edd0ccb53b6a753da7
parent04c96b0c99584b1bc66383f5fdbe9ca3ce2d226e
Merge remote-tracking branch 'origin/collectd-5.3' into collectd-5.4