Merge remote-tracking branch 'jedisct1/master' * jedisct1/master: replace timer addition with timeradd() Indent avoid calling syslog() from within signal handler indent these messages should be DEBUG Missing ) Use the same type for debug as other flags make debug a runtime parameter microsecond resolution debug timestamps remove unused macro allow specification of different multicast addresses Conflicts: src/carp.c src/globals.h src/ucarp.c src/ucarp_p.h * miconda/master - fixed conflicts: - remove pid and state files in the new place of handling exit signal - make equivalent between the -D and -L DEBUG