diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-17 13:04:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-17 13:04:59 +0200 |
| commit | f06862eff598b0355fa5e21424906e48dc7581da (patch) | |
| tree | 5d399fbcbf450605a3d321c838a16c29b24c54e1 /doc | |
| parent | e2836f5f430e63bd96502cca74dbc302938e5a23 (diff) | |
| parent | 0de862d5a6938b73a8b11d125946740c591a5a1f (diff) | |
| download | rsyslog-f06862eff598b0355fa5e21424906e48dc7581da.tar.gz rsyslog-f06862eff598b0355fa5e21424906e48dc7581da.tar.xz rsyslog-f06862eff598b0355fa5e21424906e48dc7581da.zip | |
Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable
Conflicts:
ChangeLog
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions