Merge remote-tracking branch 'github/pr/1093'
authorFlorian Forster <octo@collectd.org>
Thu, 25 Jun 2015 20:34:26 +0000 (22:34 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 25 Jun 2015 20:34:26 +0000 (22:34 +0200)
commit10a3718bdf7761e247b06808b8c72ca75cb0e0ba
tree23a2cfc8d596eefcfefbb98ec3f4a09264ba935d
parentd561993fd1bfb93df203484c4c225aca8b45f041
parentbd6f82dc3e2e6f90a5741539a4840aec3a53e493
Merge remote-tracking branch 'github/pr/1093'