![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sebastian Harl <sh@tokkee.org> | |
| Thu, 5 Jul 2012 11:38:52 +0000 (13:38 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Thu, 5 Jul 2012 11:38:52 +0000 (13:38 +0200) | ||
| commit | 2c42c3da80c6203ef0575c5ddd7136d5a8be22c4 | |
| tree | 190377f9a3c74fd50d4984b89d4ba0eba812460f | tree | snapshot |
| parent | 26651b990ae2593f7a758f06de6743bbd58b93f1 | commit | diff |
| parent | 7890e1ab963595b2637c7faf9cd06ca8031a3153 | commit | diff |
Merged branch 'master' into squeeze-backports.
Conflicts:
debian/changelog
debian/collectd.conf
debian/control
debian/rules
Conflicts:
debian/changelog
debian/collectd.conf
debian/control
debian/rules
| debian/changelog | diff1 | | diff2 | | blob | history |