diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 13:47:18 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 13:47:18 +0100 |
| commit | d3df5f024265c3a9264af6804be6534f189f9136 (patch) | |
| tree | 33d752750efbf2cb9be2a13aaba99509c0221ae2 /ChangeLog | |
| parent | 22b7ecfe76fefcbf7f911e8737d2c9fd55f60edd (diff) | |
| parent | 785e107502f58808152b3134915fd3c986b1ed27 (diff) | |
| download | rsyslog-d3df5f024265c3a9264af6804be6534f189f9136.tar.gz rsyslog-d3df5f024265c3a9264af6804be6534f189f9136.tar.xz rsyslog-d3df5f024265c3a9264af6804be6534f189f9136.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
configure.ac
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions