diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-05 17:27:02 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-05 17:27:02 +0100 |
commit | e5f728face744ee6cfe2924da251a428a16c63d8 (patch) | |
tree | 5fba65f16677d5ac8d9d2691c477b0398a56c6b2 /tools | |
parent | 5c09faee34befd6c2fa117055928c810ccf86f91 (diff) | |
parent | 2b03e46acfc52b2933f45ba6ba38a36522163fdf (diff) | |
download | rsyslog-e5f728face744ee6cfe2924da251a428a16c63d8.tar.gz rsyslog-e5f728face744ee6cfe2924da251a428a16c63d8.tar.xz rsyslog-e5f728face744ee6cfe2924da251a428a16c63d8.zip |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
configure.ac
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions