Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3
authorFlorian Forster <octo@collectd.org>
Tue, 2 Sep 2014 17:51:37 +0000 (19:51 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 2 Sep 2014 17:51:37 +0000 (19:51 +0200)
commiteb342c120baa5d015d71ae8ec8fba490df88ee64
tree4b00382138da56900399e6566e02dd9f8d582da1
parent670dd12b750843cf83ac3cf052b4c2d8b635c212
parentdfb341bca520dbe01e2f7b551548dea6aad6310c
Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3