diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-16 18:39:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-16 18:39:06 +0200 |
| commit | 475eb28e551f1b12ebde3b2f2ddb2c33403f192c (patch) | |
| tree | 247b9f1beab50d0355be1151b4e45d6da3260333 /plugins | |
| parent | c561994c108627c490729d98d671c45b4f9684e5 (diff) | |
| parent | b3dae5cff321e066bacc5e03846c77f832004006 (diff) | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions