summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-24 18:21:49 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-24 18:21:49 +0100
commit5f1c3f4db55203d4b9148eb1d5e66b35df9a64d5 (patch)
tree9e56704c0621c5cf593a4cf90f12f2a8924aa333
parent8592955c3ff97ece4e21c96454ee681743557a76 (diff)
parent78a919444daec19b4f2713a78453f308b94adb15 (diff)
downloadrsyslog-5f1c3f4db55203d4b9148eb1d5e66b35df9a64d5.tar.gz
rsyslog-5f1c3f4db55203d4b9148eb1d5e66b35df9a64d5.tar.bz2
rsyslog-5f1c3f4db55203d4b9148eb1d5e66b35df9a64d5.zip
Merge branch 'v7-devel'
Conflicts: tests/Makefile.am
0 files changed, 0 insertions, 0 deletions