Code

collectd.git
17 years agoMerge branch 'sh/freebsd'
Florian Forster [Wed, 7 Feb 2007 12:58:55 +0000 (13:58 +0100)]
Merge branch 'sh/freebsd'

17 years agosrc/utils_dns.c: Fix the handling of the `struct udphdr' under the GNU libc and other...
Florian Forster [Wed, 7 Feb 2007 12:58:23 +0000 (13:58 +0100)]
src/utils_dns.c: Fix the handling of the `struct udphdr' under the GNU libc and other systems.

17 years agoprocesses.c, utils_dns.c: Fix compile errors on GNU/kFreeBSD.
Sebastian Harl [Mon, 5 Feb 2007 21:42:26 +0000 (22:42 +0100)]
processes.c, utils_dns.c: Fix compile errors on GNU/kFreeBSD.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
17 years agocollection.cgi: Fix typos.
Florian Forster [Wed, 7 Feb 2007 12:12:31 +0000 (13:12 +0100)]
collection.cgi: Fix typos.

17 years agoMerge branch 'pull/uni' into collectd-4
Florian Forster [Mon, 5 Feb 2007 19:01:27 +0000 (20:01 +0100)]
Merge branch 'pull/uni' into collectd-4

17 years agotape plugin: Converted to the new plugin interface.
Florian Forster [Mon, 5 Feb 2007 11:30:10 +0000 (12:30 +0100)]
tape plugin: Converted to the new plugin interface.

17 years agoserial plugin: Converted to the new plugin interface.
Florian Forster [Mon, 5 Feb 2007 11:20:12 +0000 (12:20 +0100)]
serial plugin: Converted to the new plugin interface.

17 years agomultimeter plugin: Converted to the new plugin interface.
Florian Forster [Mon, 5 Feb 2007 11:06:04 +0000 (12:06 +0100)]
multimeter plugin: Converted to the new plugin interface.

17 years agohddtemp plugin: Converted to the new plugin interface.
Florian Forster [Mon, 5 Feb 2007 10:12:29 +0000 (11:12 +0100)]
hddtemp plugin: Converted to the new plugin interface.

17 years agombmon plugin: Correct the `type's being passed to the dispatch function.
Florian Forster [Mon, 5 Feb 2007 10:11:37 +0000 (11:11 +0100)]
mbmon plugin: Correct the `type's being passed to the dispatch function.

17 years agombmon plugin: Converted to the new plugin interface.
Florian Forster [Mon, 5 Feb 2007 09:51:03 +0000 (10:51 +0100)]
mbmon plugin: Converted to the new plugin interface.

17 years agomysql plugin: Converted to the new plugin interface.
Florian Forster [Sun, 4 Feb 2007 09:50:17 +0000 (10:50 +0100)]
mysql plugin: Converted to the new plugin interface.

17 years ago{apcups,battery} plugin: Changes the voltage DS as for the sensors plugin.
Florian Forster [Sun, 4 Feb 2007 09:18:18 +0000 (10:18 +0100)]
{apcups,battery} plugin: Changes the voltage DS as for the sensors plugin.

17 years agosensors plugin: Change the DS of `voltage' to be named `value' as for other physical...
Florian Forster [Sun, 4 Feb 2007 09:15:10 +0000 (10:15 +0100)]
sensors plugin: Change the DS of `voltage' to be named `value' as for other physical data-sets.

17 years agoplugin interface: If an init-function fails, write an error to syslog and remove...
Florian Forster [Sun, 4 Feb 2007 09:14:35 +0000 (10:14 +0100)]
plugin interface: If an init-function fails, write an error to syslog and remove the read function.

17 years agowireless plugin: Converted to the new plugin interface.
Florian Forster [Sun, 4 Feb 2007 09:13:05 +0000 (10:13 +0100)]
wireless plugin: Converted to the new plugin interface.

17 years agocollection.cgi: Reload the images using JavaScript if enabled.
Florian Forster [Fri, 2 Feb 2007 20:42:36 +0000 (21:42 +0100)]
collection.cgi: Reload the images using JavaScript if enabled.

17 years agodns plugin: Converted to the new plugin interface.
Florian Forster [Fri, 2 Feb 2007 20:38:02 +0000 (21:38 +0100)]
dns plugin: Converted to the new plugin interface.

17 years agoswap plugin: Converted to the new plugin interface.
Florian Forster [Wed, 31 Jan 2007 15:40:47 +0000 (16:40 +0100)]
swap plugin: Converted to the new plugin interface.

17 years agontpd plugin: Converted to the new plugin interface.
Florian Forster [Wed, 31 Jan 2007 15:22:37 +0000 (16:22 +0100)]
ntpd plugin: Converted to the new plugin interface.

17 years agounixsock plugin: Finally fixed the `pthread_t'-initialization to be platform independant.
Florian Forster [Wed, 31 Jan 2007 14:38:36 +0000 (15:38 +0100)]
unixsock plugin: Finally fixed the `pthread_t'-initialization to be platform independant.

17 years agounixsock plugin: Fix the initialization of the pthread variable under Mac OS X.
Florian Forster [Wed, 31 Jan 2007 13:40:01 +0000 (14:40 +0100)]
unixsock plugin: Fix the initialization of the pthread variable under Mac OS X.

17 years agoprocesses plugin: Converted to the new plugin interface.
Florian Forster [Wed, 31 Jan 2007 13:38:33 +0000 (14:38 +0100)]
processes plugin: Converted to the new plugin interface.

A first version anyways.

17 years agoMerge branch 'pull/collectd-4'
Florian Forster [Wed, 31 Jan 2007 12:48:21 +0000 (13:48 +0100)]
Merge branch 'pull/collectd-4'

17 years agocpu plugin: Remove newline from syslog message.
Florian Forster [Wed, 31 Jan 2007 12:48:08 +0000 (13:48 +0100)]
cpu plugin: Remove newline from syslog message.

17 years agosrc/plugin.c: Implemented delaying of read-functions that fail.
Florian Forster [Wed, 31 Jan 2007 11:17:37 +0000 (12:17 +0100)]
src/plugin.c: Implemented delaying of read-functions that fail.

The usual quadratic increase of delay-intervals is being used to disable the
function for up to 24 hours.

17 years agocpufreq plugin: Converted to the new plugin interface.
Florian Forster [Wed, 31 Jan 2007 08:27:25 +0000 (09:27 +0100)]
cpufreq plugin: Converted to the new plugin interface.

17 years agosrc/plugin.[ch]: Provide unregister-functions for plugins to remove certain functions.
Florian Forster [Mon, 29 Jan 2007 14:08:52 +0000 (15:08 +0100)]
src/plugin.[ch]: Provide unregister-functions for plugins to remove certain functions.

17 years agodisk plugin: Converted to the new plugin interface.
Florian Forster [Mon, 29 Jan 2007 13:54:10 +0000 (14:54 +0100)]
disk plugin: Converted to the new plugin interface.

17 years agobattery plugin: Converted to the new plugin interface.
Florian Forster [Mon, 29 Jan 2007 12:14:49 +0000 (13:14 +0100)]
battery plugin: Converted to the new plugin interface.

17 years agodf plugin: Converted to the new plugin interface.
Florian Forster [Mon, 29 Jan 2007 10:20:09 +0000 (11:20 +0100)]
df plugin: Converted to the new plugin interface.

17 years agounixsock plugin: Make created threads to be `detached'.
Florian Forster [Mon, 29 Jan 2007 10:02:41 +0000 (11:02 +0100)]
unixsock plugin: Make created threads to be `detached'.

17 years agocpu plugin: Write each CPU-counter in a seperate RRD-file.
Florian Forster [Sun, 28 Jan 2007 19:15:33 +0000 (20:15 +0100)]
cpu plugin: Write each CPU-counter in a seperate RRD-file.

This has proven to be a lot more flexible. And if we're to add `interrupt' and
`soft interrupt' counters anyway, we might as well change it to this superior
layout.

17 years agounixsock plugin, collectd-nagios: Use the hostname, too, to identify values.
Florian Forster [Sun, 28 Jan 2007 19:00:28 +0000 (20:00 +0100)]
unixsock plugin, collectd-nagios: Use the hostname, too, to identify values.

This is, of course, necessary, because many hosts may submit their values.

17 years agocollectd-nagios: Added an option to select certain DSes and updated the usage.
Florian Forster [Sun, 28 Jan 2007 17:52:45 +0000 (18:52 +0100)]
collectd-nagios: Added an option to select certain DSes and updated the usage.

17 years agocollectd-nagios: Added a small program to perform Nagios-compatible checks on values.
Florian Forster [Sun, 28 Jan 2007 17:14:39 +0000 (18:14 +0100)]
collectd-nagios: Added a small program to perform Nagios-compatible checks on values.

17 years agounixsock plugin: Transmit the DS name so clients can chose which values they need.
Florian Forster [Sun, 28 Jan 2007 17:14:07 +0000 (18:14 +0100)]
unixsock plugin: Transmit the DS name so clients can chose which values they need.

17 years agoMerge branch 'collectd-4' into ff/unixsock
Florian Forster [Sun, 28 Jan 2007 11:24:21 +0000 (12:24 +0100)]
Merge branch 'collectd-4' into ff/unixsock

17 years agocpu plugin: Fix a bug in the data-set description.
Florian Forster [Sun, 28 Jan 2007 11:22:47 +0000 (12:22 +0100)]
cpu plugin: Fix a bug in the data-set description.

17 years agounixsock plugin: Added a first version of a UNIX-socket output plugin.
Florian Forster [Sun, 28 Jan 2007 11:22:17 +0000 (12:22 +0100)]
unixsock plugin: Added a first version of a UNIX-socket output plugin.

The goal is to build a nagios-interface on top of this.

17 years agoconfigure.in: Fix typo.
Christian Wiese [Sun, 28 Jan 2007 09:45:07 +0000 (10:45 +0100)]
configure.in: Fix typo.

17 years agocontrib/fedora/collectd.spec: Corrected the position of the init.d-script.
Florian Forster [Wed, 24 Jan 2007 16:52:03 +0000 (17:52 +0100)]
contrib/fedora/collectd.spec: Corrected the position of the init.d-script.

17 years agocollectd.spec: Moved to `contrib/fedora/'.
Florian Forster [Wed, 24 Jan 2007 16:49:14 +0000 (17:49 +0100)]
collectd.spec: Moved to `contrib/fedora/'.

Likewise the init.d-script.

17 years agocollectd.spec: Updates for Fedora.
Iain Lea [Wed, 24 Jan 2007 16:33:40 +0000 (17:33 +0100)]
collectd.spec: Updates for Fedora.

* Wed Jan 11 2007 Iain Lea <iain@bricbrac.de> 3.11.0-1
- fixed spec file to build correctly on fedora core
- added improved init.d script to work with chkconfig
- added %post and %postun to call chkconfig automatically

17 years agoMerge branch 'pull/collectd-4'
Florian Forster [Mon, 22 Jan 2007 21:55:50 +0000 (22:55 +0100)]
Merge branch 'pull/collectd-4'

17 years agoapple_sensors plugin: Converted to the new plugin interface.
Florian Forster [Mon, 22 Jan 2007 21:55:37 +0000 (22:55 +0100)]
apple_sensors plugin: Converted to the new plugin interface.

17 years agocpu plugin: Improved some syslog messages.
Florian Forster [Mon, 22 Jan 2007 21:54:42 +0000 (22:54 +0100)]
cpu plugin: Improved some syslog messages.

Also updated the copyright notice.

17 years agonfs plugin: Fixes to work under !Linux.
Florian Forster [Mon, 22 Jan 2007 21:53:25 +0000 (22:53 +0100)]
nfs plugin: Fixes to work under !Linux.

17 years agotraffic plugin: Fix the plugin to work under Mac OS X.
Florian Forster [Mon, 22 Jan 2007 21:52:49 +0000 (22:52 +0100)]
traffic plugin: Fix the plugin to work under Mac OS X.

17 years agocsv plugin: Fixed the initialization of `struct flock' to be portable.
Florian Forster [Mon, 22 Jan 2007 21:52:14 +0000 (22:52 +0100)]
csv plugin: Fixed the initialization of `struct flock' to be portable.

It didn't work on Mac OS X for example.

17 years agoMerge branch 'ff/entropy' into collectd-4
Florian Forster [Mon, 22 Jan 2007 21:36:40 +0000 (22:36 +0100)]
Merge branch 'ff/entropy' into collectd-4

17 years agotraffic plugin: Updated copyright notice.
Florian Forster [Mon, 22 Jan 2007 21:36:14 +0000 (22:36 +0100)]
traffic plugin: Updated copyright notice.

17 years agosensors plugin: Fixed some syntactic errors.
Florian Forster [Mon, 22 Jan 2007 21:35:55 +0000 (22:35 +0100)]
sensors plugin: Fixed some syntactic errors.

17 years agosensors plugin: Improved the data sources, changed the license and updated the copyri...
Florian Forster [Mon, 22 Jan 2007 09:57:46 +0000 (10:57 +0100)]
sensors plugin: Improved the data sources, changed the license and updated the copyright notice.

17 years agoapcups plugin: Converted to the new plugin interface.
Florian Forster [Mon, 22 Jan 2007 09:56:33 +0000 (10:56 +0100)]
apcups plugin: Converted to the new plugin interface.

17 years agosrc/collectd.h: Include `math.h' and try to force it to define `NAN'.
Florian Forster [Mon, 22 Jan 2007 09:56:10 +0000 (10:56 +0100)]
src/collectd.h: Include `math.h' and try to force it to define `NAN'.

17 years agoentropy plugin: Added a plugin to collect available entropy.
Florian Forster [Mon, 22 Jan 2007 08:59:47 +0000 (09:59 +0100)]
entropy plugin: Added a plugin to collect available entropy.

Only works on Linux systems right now..

17 years agoping plugin: Converted to the new plugin interface.
Florian Forster [Mon, 22 Jan 2007 08:31:39 +0000 (09:31 +0100)]
ping plugin: Converted to the new plugin interface.

17 years agomemory plugin: Converted to the new plugin interface.
Florian Forster [Wed, 17 Jan 2007 11:36:51 +0000 (12:36 +0100)]
memory plugin: Converted to the new plugin interface.

17 years agonetwork plugin: Use a global buffer and fill it as much as possible.
Florian Forster [Tue, 16 Jan 2007 14:51:50 +0000 (15:51 +0100)]
network plugin: Use a global buffer and fill it as much as possible.

This should lessen network load, hopefully.

17 years agosrc/common.c: Removed `log_update_file' and `log_create_file'.
Florian Forster [Tue, 16 Jan 2007 08:50:43 +0000 (09:50 +0100)]
src/common.c: Removed `log_update_file' and `log_create_file'.

Also changed the license to GPLv2-only and updated the copyright date.

17 years agocsv plugin: Added this plugin which writes to CSV files.
Florian Forster [Tue, 16 Jan 2007 08:42:35 +0000 (09:42 +0100)]
csv plugin: Added this plugin which writes to CSV files.

This is basically the old `logfile' functionality.

17 years agocollectd.spec: Updated for version 3.11
Iain Lea [Tue, 16 Jan 2007 06:59:50 +0000 (07:59 +0100)]
collectd.spec: Updated for version 3.11

Never received any feedback from you and every release still contains a spec
file that is out of date... here is the spec file updated to build ok on fedora
core 3-6.

17 years agocpu plugin: Converted to the new plugin interface.
Florian Forster [Mon, 15 Jan 2007 22:02:58 +0000 (23:02 +0100)]
cpu plugin: Converted to the new plugin interface.

17 years agosrc/collectd.conf.in: Added the rrdtool plugin and configuration examples.
Florian Forster [Mon, 15 Jan 2007 18:34:43 +0000 (19:34 +0100)]
src/collectd.conf.in: Added the rrdtool plugin and configuration examples.

17 years agoload, traffic plugins: Changed license to GPLv2 only.
Florian Forster [Mon, 15 Jan 2007 18:33:15 +0000 (19:33 +0100)]
load, traffic plugins: Changed license to GPLv2 only.

17 years agoapache plugin: Converted to the new plugin interface.
Florian Forster [Mon, 15 Jan 2007 18:32:39 +0000 (19:32 +0100)]
apache plugin: Converted to the new plugin interface.

17 years agoMerge branch 'master' into collectd-4
Florian Forster [Mon, 15 Jan 2007 17:36:26 +0000 (18:36 +0100)]
Merge branch 'master' into collectd-4

Conflicts:

src/sensors.c

17 years agoMerge branch 'ff/plugins-ng' of octo@verplant.org:/var/lib/git/collectd into ff/plugi...
Florian Forster [Mon, 15 Jan 2007 17:30:36 +0000 (18:30 +0100)]
Merge branch 'ff/plugins-ng' of octo@verplant.org:/var/lib/git/collectd into ff/plugins-ng

17 years agosensors plugin: Converted to the new plugin interface.
Florian Forster [Mon, 15 Jan 2007 13:56:53 +0000 (14:56 +0100)]
sensors plugin: Converted to the new plugin interface.

17 years agosrc/plugin.[ch]: Store the hostname in a global variable to minimize calls to `gethos...
Florian Forster [Mon, 15 Jan 2007 13:00:10 +0000 (14:00 +0100)]
src/plugin.[ch]: Store the hostname in a global variable to minimize calls to `gethostname'.

17 years agosrc/plugin.h: Added `VALUE_LIST_INIT', a static initializer for value_list_t.
Florian Forster [Mon, 15 Jan 2007 12:49:15 +0000 (13:49 +0100)]
src/plugin.h: Added `VALUE_LIST_INIT', a static initializer for value_list_t.

17 years agonfs plugin: Ported to the new plugin structure.
Florian Forster [Mon, 15 Jan 2007 10:40:25 +0000 (11:40 +0100)]
nfs plugin: Ported to the new plugin structure.

17 years agonetwork plugin: Don't case an int to a void*, because some systems don't like it..
Florian Forster [Sun, 14 Jan 2007 20:12:15 +0000 (21:12 +0100)]
network plugin: Don't case an int to a void*, because some systems don't like it..

17 years agocollectd.conf(5): Documented the option of the rrdtool-plugin.
Florian Forster [Sun, 14 Jan 2007 17:55:07 +0000 (18:55 +0100)]
collectd.conf(5): Documented the option of the rrdtool-plugin.

17 years agorrdtool plugin: Implemented caching of values to minimize IO operations.
Florian Forster [Sun, 14 Jan 2007 14:06:07 +0000 (15:06 +0100)]
rrdtool plugin: Implemented caching of values to minimize IO operations.

Use the `CacheTimeout' option to enable this feature.

17 years agosrc/utils_llist.[ch]: Implemented `llist_remove'.
Florian Forster [Sun, 14 Jan 2007 13:36:17 +0000 (14:36 +0100)]
src/utils_llist.[ch]: Implemented `llist_remove'.

17 years agotraffic plugin: Converted the plugin to the new plugin ifrastructure.
Florian Forster [Sat, 13 Jan 2007 18:12:34 +0000 (19:12 +0100)]
traffic plugin: Converted the plugin to the new plugin ifrastructure.

17 years agonetwork plugin: Fix many bugs, especially `hton*' and `ntoh*' related.
Florian Forster [Sat, 13 Jan 2007 17:23:51 +0000 (18:23 +0100)]
network plugin: Fix many bugs, especially `hton*' and `ntoh*' related.

17 years agoload plugin: Set the hostname to something meaningfull, not `localhost'.
Florian Forster [Sat, 13 Jan 2007 17:23:15 +0000 (18:23 +0100)]
load plugin: Set the hostname to something meaningfull, not `localhost'.

17 years agorrdtool plugin: Use the time supplied by the value list, not `N'.
Florian Forster [Sat, 13 Jan 2007 17:22:49 +0000 (18:22 +0100)]
rrdtool plugin: Use the time supplied by the value list, not `N'.

17 years agosrc/plugin.[ch]: Include the time in the value list.
Florian Forster [Sat, 13 Jan 2007 17:21:22 +0000 (18:21 +0100)]
src/plugin.[ch]: Include the time in the value list.

This is necessary when we will implement caching in the future.

17 years agosrc/Makefile.am: Link the network plugin against pthread.
Florian Forster [Sat, 13 Jan 2007 17:20:19 +0000 (18:20 +0100)]
src/Makefile.am: Link the network plugin against pthread.

17 years agoMerge branch 'master' into ff/plugins-ng
Florian Forster [Sat, 13 Jan 2007 15:47:15 +0000 (16:47 +0100)]
Merge branch 'master' into ff/plugins-ng

Conflicts:

src/collectd.c
src/network.c

17 years agosrc/{dns,ntpd}.c: Use <poll.h> rather than <sys/poll.h>.
Florian Forster [Sat, 13 Jan 2007 15:44:19 +0000 (16:44 +0100)]
src/{dns,ntpd}.c: Use <poll.h> rather than <sys/poll.h>.

17 years agosrc/{collectd,plugin}.[ch]: Changed license to GPLv2 only.
Florian Forster [Sat, 13 Jan 2007 15:43:44 +0000 (16:43 +0100)]
src/{collectd,plugin}.[ch]: Changed license to GPLv2 only.

17 years agosrc/configfile.c: Removed `cf_callback_socket'
Florian Forster [Sat, 13 Jan 2007 15:42:04 +0000 (16:42 +0100)]
src/configfile.c: Removed `cf_callback_socket'

.. since the network stuff is now implemented as a plugin.

17 years agonetwork plugin: Changed the old network code to work as a plugin.
Florian Forster [Sat, 13 Jan 2007 15:41:16 +0000 (16:41 +0100)]
network plugin: Changed the old network code to work as a plugin.

It's mostly untested, but basic sending appears to work fine.

17 years agorrdtool plugin: Fixed misc. bugs and changed license to GPLv2 only.
Florian Forster [Sat, 13 Jan 2007 15:39:44 +0000 (16:39 +0100)]
rrdtool plugin: Fixed misc. bugs and changed license to GPLv2 only.

17 years agocommon.c: Implemented `ntohll' and `htonll'.
Florian Forster [Sat, 13 Jan 2007 11:21:16 +0000 (12:21 +0100)]
common.c: Implemented `ntohll' and `htonll'.

17 years agoemail plugin: Ignore size if it less than or equal to zero. collectd-3.11.0
Sebastian Harl [Sun, 24 Dec 2006 13:22:49 +0000 (14:22 +0100)]
email plugin: Ignore size if it less than or equal to zero.

Some daemons (e.g. postgrey) don't provide any size information.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
17 years agosensors plugin: Avoid assertion in ignorelist_match () when not configured.
Sebastian Harl [Sat, 23 Dec 2006 13:01:14 +0000 (14:01 +0100)]
sensors plugin: Avoid assertion in ignorelist_match () when not configured.

If the sensors plugin is not configured (i.e. default settings are used) the
ignorelist (sensors_list) is never created causing the assertion in
ignorelist_match () to fail. This fixes it.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
17 years agoBumped version to 3.11.0; Updated ChangeLog.
Florian Forster [Fri, 22 Dec 2006 14:15:38 +0000 (15:15 +0100)]
Bumped version to 3.11.0; Updated ChangeLog.

17 years agosrc/collectd.h: Don't mess with the syslog-stuff if it's present.
Michael Shigorin [Fri, 22 Dec 2006 14:06:42 +0000 (15:06 +0100)]
src/collectd.h: Don't mess with the syslog-stuff if it's present.

No idea where it came from, but it's not necessary, thus remove it. This even
resolves a conflice with some newer glibc version.

17 years agoAUTHORS: Converted to UTF-8 and added Lubos' efforts.
Florian Forster [Fri, 22 Dec 2006 13:59:04 +0000 (14:59 +0100)]
AUTHORS: Converted to UTF-8 and added Lubos' efforts.

17 years agoAdded the `mbmon' plugin to the ChangeLog for 3.11.0
Florian Forster [Fri, 22 Dec 2006 09:44:13 +0000 (10:44 +0100)]
Added the `mbmon' plugin to the ChangeLog for 3.11.0

.. and Flavio Stanchina to the list of contributors.

17 years agoMerge branch 'fs/mbmon'
Florian Forster [Fri, 22 Dec 2006 09:39:18 +0000 (10:39 +0100)]
Merge branch 'fs/mbmon'

17 years agoMerge branch 'ls/sensors'
Florian Forster [Fri, 22 Dec 2006 09:38:07 +0000 (10:38 +0100)]
Merge branch 'ls/sensors'

17 years agombmon plugin: Change the definition of the RRD files.
Florian Forster [Thu, 21 Dec 2006 21:49:22 +0000 (22:49 +0100)]
mbmon plugin: Change the definition of the RRD files.

Change the RRD files to be of the same format as the `apple_sensors' or the
`sensors extended' formats.

17 years agoMerge branch 'sh/email'
Florian Forster [Thu, 21 Dec 2006 20:12:24 +0000 (21:12 +0100)]
Merge branch 'sh/email'