diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-21 10:51:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-21 10:51:43 +0200 |
| commit | 3187982c3c94e5eac257e206f19fa7326c8e7739 (patch) | |
| tree | 6e5049e12d7fde51015ceccb81ccdf043c55f2c1 /doc | |
| parent | d30526568c77ceddedd47dd0c309c2224bb74ba0 (diff) | |
| parent | b513239352dd0c2c2fbf94e08af664e09a4bed41 (diff) | |
| download | rsyslog-3187982c3c94e5eac257e206f19fa7326c8e7739.tar.gz rsyslog-3187982c3c94e5eac257e206f19fa7326c8e7739.tar.xz rsyslog-3187982c3c94e5eac257e206f19fa7326c8e7739.zip | |
Merge branch 'aaron' into v4-beta
Conflicts:
ChangeLog
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions