rsyslog.git, branch master

rsyslog.git, branch master rsyslog development for Lumberjack - various unofficial and potentially rebased branches Merge branch 'beta' 2012-10-19T07:33:33+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-19T07:33:33+00:00 b151584d0929759284c0fb0399709e5ca0e29d60

Merge branch 'v6-stable' into beta 2012-10-19T07:33:22+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-19T07:33:22+00:00 e9cf777ca422a964b4324111f4c93d84652ce2fc

Merge branch 'v5-stable' into v6-stable 2012-10-19T07:32:58+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-19T07:32:58+00:00 16e3921905bb0b3f48b0b387e750d0f40439d634 Conflicts: runtime/nsdpoll_ptcp.c

Conflicts:
	runtime/nsdpoll_ptcp.c

fix epoll-enabled code to use correct data member for pointers 2012-10-19T07:07:32+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-19T07:07:32+00:00 d36407c7947ba119c971427e1528122509bf895f

doc: improve module doc 2012-10-19T06:30:45+00:00 Florian Riedl friedel@adiscon.com 2012-10-19T06:30:45+00:00 8d80f53c2b03a445d3c05046c45f8d4a4beec358

prepare for 7.3.1 release 2012-10-19T06:27:50+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-19T06:27:50+00:00 386b0be7ea5fec0f2d4f62ad20214762a639111a

Merge branch 'beta' 2012-10-19T06:13:15+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-19T06:13:15+00:00 d2f2eaf67ef13faf23fd2231076c937812db9050 Conflicts: ChangeLog

Conflicts:
	ChangeLog

doc: add imported bugfix to ChangeLog 2012-10-19T06:11:45+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-19T06:11:45+00:00 a328d6bd3921aa696e790b16e3c36a0f951258aa plus some cleanup

plus some cleanup

Merge branch 'v6-stable' into beta 2012-10-19T06:10:24+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-19T06:10:24+00:00 f2e64772488170f21c333cc0bfcf5f289007f457

bugfix: imuxsock did not properly honor $LocalHostIPIF 2012-10-19T06:08:46+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-19T06:08:46+00:00 d4690ae053b1b26fd215485f08875d508d7c4eba