[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 src/email.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a4d48134385bf44e033bfbcc397fb03572617d4e
Merge: d53b685013dfe99d1ceac1d283f63ccfbc841dae 620ba7b575a4d2a9c8c997a240d178980b39276f
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sat Jun 14 17:53:25 2008 +0200

    Merge branch 'master' of /var/lib/git/collectd
    
    Conflicts:
    
    	src/email.c

commit d53b685013dfe99d1ceac1d283f63ccfbc841dae
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sat Jun 14 17:51:36 2008 +0200

    email plugin: Fix a format string.