diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:32:03 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:32:03 +0200 |
commit | 8ea796903215ecaba737f9fbe89c0e052825535d (patch) | |
tree | eed7b742e7d50d7bae6d5f7055342469ec82fdff /plugins/mmnormalize/mmnormalize.c | |
parent | 8162ff020d7c37ca1c9ec18e31e09e7f18df1cac (diff) | |
parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
download | rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.tar.gz rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.tar.bz2 rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.zip |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
doc/manual.html
Diffstat (limited to 'plugins/mmnormalize/mmnormalize.c')
0 files changed, 0 insertions, 0 deletions