Merge branch 'collectd-4.2'

Conflicts:

	src/utils_llist.c

diff --cc src/collectd-perl.pod
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/logfile.c
Simple merge

diff --cc src/utils_avltree.c
Simple merge

diff --cc src/utils_llist.c
index f7e03c239b9889d4f62ecb62ae34488c868de2eb,d5db9dc03abbab0d84df4676ec12a4dffea409e2..7fae025d62233ca51613268369239c43f516f973
--- 1/src/utils_llist.c
--- 2/src/utils_llist.c
+++ b/src/utils_llist.c
@@@ -106,7 -110,9 +106,11 @@@ void llist_prepend (llist_t *l, llentry
  {
        e->next = l->head;
        l->head = e;
+ 
+       if (l->tail == NULL)
+               l->tail = e;
++
 +      ++(l->size);
  }
  
  void llist_remove (llist_t *l, llentry_t *e)