diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-01 08:30:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-01 08:30:33 +0200 |
| commit | 404230c4bdd42e1d9ca673ba3cc128c2b1e936e4 (patch) | |
| tree | f76bc7b8bf46a93699d618dc2e45edd2e4c13538 /AUTHORS | |
| parent | f139dc28feb74f9c8b66736905ae7d3cacd035b6 (diff) | |
| parent | 302ad02e7781892856c1cacaf98a87f90db9571c (diff) | |
| download | rsyslog-404230c4bdd42e1d9ca673ba3cc128c2b1e936e4.tar.gz rsyslog-404230c4bdd42e1d9ca673ba3cc128c2b1e936e4.tar.xz rsyslog-404230c4bdd42e1d9ca673ba3cc128c2b1e936e4.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
tools/syslogd.c
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions