Merge remote-tracking branch 'github/pr/1085'
authorFlorian Forster <octo@collectd.org>
Tue, 16 Jun 2015 18:38:38 +0000 (20:38 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 16 Jun 2015 18:38:38 +0000 (20:38 +0200)
commitc6a59a5a3f0eb7a0e81beeb948d8a31b17462efe
tree538dd4e0c79c0e9773f11ad6e21626a1f1fb2ec5
parentf64a8b0906df8f97fbe91f15a919c76b83f93ba9
parent56d85ff7bc14d98da63dc443e25085bc5544a1ea
Merge remote-tracking branch 'github/pr/1085'