summaryrefslogtreecommitdiffstats
path: root/plugins/impstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-12-19 17:30:43 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-12-19 17:30:43 +0100
commit00d2ac3d712fb037411e9856e8174e9d55b5bdbc (patch)
tree9d439fc87eeef077bda652e9ce332182c139fc60 /plugins/impstats
parentb80b0672beb9b8b4d07791791bb9f2fb7c73889a (diff)
parent55db71963e312634f78c25b61dd4800036fe25f9 (diff)
downloadrsyslog-00d2ac3d712fb037411e9856e8174e9d55b5bdbc.tar.gz
rsyslog-00d2ac3d712fb037411e9856e8174e9d55b5bdbc.tar.xz
rsyslog-00d2ac3d712fb037411e9856e8174e9d55b5bdbc.zip
Merge branch 'v5-devel'
Conflicts: ChangeLog action.c plugins/imudp/imudp.c
Diffstat (limited to 'plugins/impstats')
-rw-r--r--plugins/impstats/impstats.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/impstats/impstats.c b/plugins/impstats/impstats.c
index c3efb330..fab4c221 100644
--- a/plugins/impstats/impstats.c
+++ b/plugins/impstats/impstats.c
@@ -10,7 +10,7 @@
* of the "old" message code without any modifications. However, it
* helps to have things at the right place one we go to the meat of it.
*
- * Copyright 2010 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2010-2011 Rainer Gerhards and Adiscon GmbH.
*
* This file is part of rsyslog.
*