Merge remote-tracking branch 'github/pr/1355'
authorFlorian Forster <octo@collectd.org>
Thu, 26 Nov 2015 21:46:30 +0000 (22:46 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 26 Nov 2015 21:46:30 +0000 (22:46 +0100)
commit365d0cc032c8a5df45492cdfc1090984951e78db
tree705008132234234176eb86b10a00a69dcf85437d
parent6d64200e006f22ce3f1619251004fbe6cd674b91
parent42ac121bd1a39af34db4e187967756c631b606c5
Merge remote-tracking branch 'github/pr/1355'