![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Wed, 26 Mar 2008 08:48:27 +0000 (09:48 +0100) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Wed, 26 Mar 2008 08:48:27 +0000 (09:48 +0100) | ||
| commit | bc0a8f260e4e24bdf664c3dcff919b6f99bfe31d | |
| tree | fa9c768531dd40e4b3803efe058914a606ea3670 | tree | snapshot |
| parent | ac03ae49d85c01fe2da58dd78f66db58416d81cc | commit | diff |
| parent | 583b04d5826669eb182cb6ea538cf68266721ccb | commit | diff |
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
src/unixsock.c
Conflicts:
src/unixsock.c
| configure.in | diff1 | | diff2 | | blob | history |
| src/collectd-unixsock.pod | diff1 | | diff2 | | blob | history |
| src/liboconfig/parser.y | diff1 | | diff2 | | blob | history |
| src/perl.c | diff1 | | diff2 | | blob | history |