diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-14 18:31:03 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-14 18:31:03 +0200 |
| commit | 99b3a56e19e5cd799e602a449edc52a3378cf919 (patch) | |
| tree | 258cd2b6b7367940187872147ea54a159077e614 /Makefile.am | |
| parent | a201072a654e59dd8ac6ab21a29782bd85d6ddd7 (diff) | |
| parent | 50521ab72bcf302958b007ca77f08ce65a368fb8 (diff) | |
| download | rsyslog-99b3a56e19e5cd799e602a449edc52a3378cf919.tar.gz rsyslog-99b3a56e19e5cd799e602a449edc52a3378cf919.tar.xz rsyslog-99b3a56e19e5cd799e602a449edc52a3378cf919.zip | |
Merge branch 'v6-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions