summaryrefslogtreecommitdiffstats
path: root/tests/historical/README
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2011-08-05 14:14:23 +0200
committerAndre Lorbach <alorbach@adiscon.com>2011-08-05 14:14:23 +0200
commita8f2fd6eb4acf7484a6de53f2175c24a2d4b4cc3 (patch)
tree020ab62e213bb3c88f1a977cd1bb0b2af9e9bc18 /tests/historical/README
parentf285420d1731555eb9eb6717fc9c875651ab7c91 (diff)
parenta3953fbee90045b96bd5ef44b64883a6bff57fee (diff)
downloadrsyslog-a8f2fd6eb4acf7484a6de53f2175c24a2d4b4cc3.tar.gz
rsyslog-a8f2fd6eb4acf7484a6de53f2175c24a2d4b4cc3.tar.xz
rsyslog-a8f2fd6eb4acf7484a6de53f2175c24a2d4b4cc3.zip
Merge branch 'v4-stable' into v4-beta
Conflicts: ChangeLog
Diffstat (limited to 'tests/historical/README')
0 files changed, 0 insertions, 0 deletions