Merge pull request #5 from collectd/master
authorbbczeuz <githubmail@zeuz.ch>
Fri, 18 Dec 2015 10:28:14 +0000 (11:28 +0100)
committerbbczeuz <githubmail@zeuz.ch>
Fri, 18 Dec 2015 10:28:14 +0000 (11:28 +0100)
commitb1b0aa549005c62b0e4651053198693e33ea84f0
tree285d7ca7145de81a69628a45ce80068d9ce0b535
parent7553f3912f28f356018eb807709856b9ebf7d376
parent25888de8d7881514ce4854e39f322ad4240e3d13
Merge pull request #5 from collectd/master

merging upstream