summaryrefslogtreecommitdiffstats
path: root/plugins/mmfields/mmfields.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-06-06 11:55:23 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-06-06 11:55:23 +0200
commitf27cff39a3ec4c904e366ac3927e4975b158aafe (patch)
tree3e0f89c4feb0d70983e2bf875229be33ca574ecd /plugins/mmfields/mmfields.c
parent82688df6b52c9c1d42ca9919da13f25e2cdb9961 (diff)
parent127671fed1707e686e8d7b316b2641b663892fec (diff)
downloadrsyslog-f27cff39a3ec4c904e366ac3927e4975b158aafe.tar.gz
rsyslog-f27cff39a3ec4c904e366ac3927e4975b158aafe.tar.bz2
rsyslog-f27cff39a3ec4c904e366ac3927e4975b158aafe.zip
Merge branch 'nextmaster'
Conflicts: ChangeLog
Diffstat (limited to 'plugins/mmfields/mmfields.c')
0 files changed, 0 insertions, 0 deletions