![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Thu, 19 Aug 2010 13:03:22 +0000 (15:03 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Thu, 19 Aug 2010 13:06:00 +0000 (15:06 +0200) | ||
| commit | 6624c959628fa1188f8cfa4789da1eccccc5f5e4 | |
| tree | 2a40211fcb20744a59596314df8703752aff4fff | tree | snapshot |
| parent | d866effbc50aef27811aac113ef2619da7fc6b43 | commit | diff |
| parent | d1c3baabf0c7bf65f699fb66db5b2aea92d1f5e7 | commit | diff |
Merge branch 'master' into ff/netlib
Conflicts:
src/collectdctl.c
Conflicts:
src/collectdctl.c
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd-nagios.c | diff1 | | diff2 | | blob | history |
| src/collectdctl.c | diff1 | | diff2 | | blob | history |