diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:07:04 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:07:04 +0200 |
| commit | 68a01594000b788e530ee8f716545dafccf85982 (patch) | |
| tree | c5b54c9add730528f99c816db4faa55dfcfdbd1a /runtime | |
| parent | e8e881e9795e5dc9fc14fd7f34523bcd6ae13106 (diff) | |
| parent | f09ee69ee1b7f8c098d0720c8e85a6753cc7d342 (diff) | |
| download | rsyslog-68a01594000b788e530ee8f716545dafccf85982.tar.gz rsyslog-68a01594000b788e530ee8f716545dafccf85982.tar.xz rsyslog-68a01594000b788e530ee8f716545dafccf85982.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime')
0 files changed, 0 insertions, 0 deletions