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 remote-tracking branch 'github/master' master
authorRainer Gerhards <rgerhards@adiscon.com>
Fri, 29 Aug 2014 10:51:10 +0000 (12:51 +0200)
committerRainer Gerhards <rgerhards@adiscon.com>
Fri, 29 Aug 2014 10:51:10 +0000 (12:51 +0200)

Trivial merge