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 master-candidate
authorRainer Gerhards <rgerhards@adiscon.com>
Tue, 31 Mar 2015 15:51:08 +0000 (17:51 +0200)
committerRainer Gerhards <rgerhards@adiscon.com>
Tue, 31 Mar 2015 15:51:08 +0000 (17:51 +0200)

Trivial merge