author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sun, 2 Sep 2007 16:15:36 +0000 (18:15 +0200) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sun, 2 Sep 2007 16:15:36 +0000 (18:15 +0200) | ||
commit | 0f0dd3b00845209b865862c073813caf44d01ae8 | |
tree | 047499c60f94e5c5849815f1d0da0b463c1e3f21 | tree | snapshot |
parent | 147881fa62325e7049df62765743444a3d0e4cf6 | commit | diff |
parent | eb9df12331cd6b07c4223dbda9a948fcb244841e | commit | diff |
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
contrib/collection.cgi
Conflicts:
contrib/collection.cgi
configure.in | diff1 | | diff2 | | blob | history |