Code

Merge branch 'ff/highres'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 17 Nov 2010 14:18:03 +0000 (15:18 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 17 Nov 2010 14:20:11 +0000 (15:20 +0100)
commit83077c18c3e78739c2d2d18debf99875944eaa72
treefe44fc8d82b4ccb70810ce031689eb586be1c7e7
parent053bea810096f410d3b03ade7ef761da05565a45
parente94e1ca83a8ac255f045259ec898f944f9118430
Merge branch 'ff/highres'

Conflicts:
src/netapp.c
configure.in
src/Makefile.am
src/collectd.h
src/netapp.c
src/network.c
src/notify_email.c
src/python.c
src/utils_cache.c