Merge branch 'master' of github.com:collectd/collectd
authorPierre-Yves Ritschard <pyr@spootnik.org>
Sat, 26 Jul 2014 07:05:40 +0000 (09:05 +0200)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Sat, 26 Jul 2014 07:05:40 +0000 (09:05 +0200)
commitf26c9db10bf0a1efdb33c5c682824254059758e6
treed9c33d3789df5b813078716c6568812dca933beb
parent08ed870bf8e9bdda64ca192150870b1e7ffb5e10
parenta5608f2e49d35a9c7f055c6b8c22048a08c2d4e9
Merge branch 'master' of github.com:collectd/collectd