![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Sat, 14 Jun 2008 15:53:25 +0000 (17:53 +0200) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Sat, 14 Jun 2008 15:53:25 +0000 (17:53 +0200) | ||
| commit | a4d48134385bf44e033bfbcc397fb03572617d4e | |
| tree | fcb9d44f879689e6cac8eb1d1b93f9b188a4019d | tree | snapshot |
| parent | d53b685013dfe99d1ceac1d283f63ccfbc841dae | commit | diff |
| parent | 620ba7b575a4d2a9c8c997a240d178980b39276f | commit | diff |
Merge branch 'master' of /var/lib/git/collectd
Conflicts:
src/email.c
Conflicts:
src/email.c