Merge branch 'v4-stable' into v5-stable
authorRainer Gerhards <rgerhards@adiscon.com>
Sat, 21 Jan 2012 16:18:16 +0000 (17:18 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Sat, 21 Jan 2012 16:18:16 +0000 (17:18 +0100)
1  2 
ChangeLog
Makefile.am

diff --cc ChangeLog
Simple merge
diff --cc Makefile.am
@@@ -60,11 -44,12 +60,13 @@@ EXTRA_DIST = 
        slackware/rc.rsyslogd \
        contrib/README \
        rsyslog.conf \
+       COPYING \
        COPYING.LESSER \
+       COPYING.ASL20 \
        contrib/gnutls/ca.pem \
        contrib/gnutls/cert.pem \
 -      contrib/gnutls/key.pem
 +      contrib/gnutls/key.pem \
 +      rsyslog.service.in
  
  SUBDIRS = doc runtime . plugins/immark plugins/imuxsock plugins/imtcp plugins/imudp plugins/omtesting