Note: there are also official repositories on github for most of the repositories present here. Please consider contributing to rsyslog.
For more information read Where to find the rsyslog source code, which applies to rsyslog-related projects (like librelp) as well.

Merge branch 'tmp-merge' into master-candidate master
authorRainer Gerhards <rgerhards@adiscon.com>
Tue, 28 Jul 2015 10:20:32 +0000 (12:20 +0200)
committerRainer Gerhards <rgerhards@adiscon.com>
Tue, 28 Jul 2015 10:20:32 +0000 (12:20 +0200)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge