Merge branch 'master' of /var/lib/git/collectd
authorFlorian Forster <octo@huhu.verplant.org>
Sat, 14 Jun 2008 15:53:25 +0000 (17:53 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Sat, 14 Jun 2008 15:53:25 +0000 (17:53 +0200)
commita4d48134385bf44e033bfbcc397fb03572617d4e
treefcb9d44f879689e6cac8eb1d1b93f9b188a4019d
parentd53b685013dfe99d1ceac1d283f63ccfbc841dae
parent620ba7b575a4d2a9c8c997a240d178980b39276f
Merge branch 'master' of /var/lib/git/collectd

Conflicts:

src/email.c