diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-16 18:59:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-16 18:59:53 +0200 |
| commit | 75079d9519c78c07004495f71ea347543a01f40e (patch) | |
| tree | d0345a40ef82ff3f6f2c0f556a837e1a637739c8 /doc/dev_queue.html | |
| parent | c63fe7befc295ea0192d66e4e2014725c3d53e40 (diff) | |
| parent | bdc609639eae599d2c63bc0ba26a8c70ce718551 (diff) | |
Merge branch 'v6-stable' into beta
Conflicts:
rsyslog.service.in
Diffstat (limited to 'doc/dev_queue.html')
0 files changed, 0 insertions, 0 deletions