diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 15:19:51 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 15:19:51 +0200 |
| commit | b2418812cf06daf229e832cc212e65828e3c3417 (patch) | |
| tree | e78b60aa3964eea6b292a71d2f350dc71653cc91 /Makefile.am | |
| parent | 45b4f3fac96005753bc1a9ec8be0510e0554d065 (diff) | |
| parent | d9a82205ff0b42a84875d45c809e8b7aded7eb2b (diff) | |
| download | rsyslog-b2418812cf06daf229e832cc212e65828e3c3417.tar.gz rsyslog-b2418812cf06daf229e832cc212e65828e3c3417.tar.xz rsyslog-b2418812cf06daf229e832cc212e65828e3c3417.zip | |
Merge branch 'v5-stable' into master
Conflicts:
ChangeLog
Makefile.am
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions