summaryrefslogtreecommitdiffstats
path: root/plugins/mmfields/mmfields.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-09-05 12:06:09 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-09-05 12:06:09 +0200
commitc6a428e6935416c3c5d849df560b9492831e704c (patch)
tree3ae55fb45404eab1b02097a48de9213b84fac599 /plugins/mmfields/mmfields.c
parent920aa96c4a3fc8b06acbe6099bf8b83a9532f8e4 (diff)
parentdd9bdb5566c56a2bb67b09a67410b16e29004568 (diff)
downloadrsyslog-c6a428e6935416c3c5d849df560b9492831e704c.tar.gz
rsyslog-c6a428e6935416c3c5d849df560b9492831e704c.tar.bz2
rsyslog-c6a428e6935416c3c5d849df560b9492831e704c.zip
Merge branch 'v7-stable'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'plugins/mmfields/mmfields.c')
0 files changed, 0 insertions, 0 deletions