diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:36:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:36:58 +0200 |
| commit | 8fbefa688fc18dd1936158318ec92a108303d2e8 (patch) | |
| tree | 5090afbc864526b9d381b365dfc6365c0ffe408d /tests/3.rstest | |
| parent | 44609ec259fdd321520111049ace194a0941a157 (diff) | |
| parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
| download | rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.gz rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.xz rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
doc/manual.html
Diffstat (limited to 'tests/3.rstest')
0 files changed, 0 insertions, 0 deletions