Code

Merged branch 'master' of git://git.tokkee.org/pkg-collectd.
authorSebastian Harl <sh@tokkee.org>
Sat, 19 May 2012 13:32:09 +0000 (15:32 +0200)
committerSebastian Harl <sh@tokkee.org>
Sat, 19 May 2012 13:32:09 +0000 (15:32 +0200)
1  2 
debian/changelog

Simple merge