diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-12 15:14:37 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-12 15:14:37 +0200 |
| commit | 05efee80c1f9ef74b912d12709919153b8d1440a (patch) | |
| tree | 64b2e4bd775f5af34be43e7f49559837bb8145ed /runtime/msg.c | |
| parent | 4c44b1f2addb9ac6a3f0da2fde1261e8e49fe1d8 (diff) | |
| parent | d749dadcc30e35448894a152fb0ddf77d60b8300 (diff) | |
| download | rsyslog-05efee80c1f9ef74b912d12709919153b8d1440a.tar.gz rsyslog-05efee80c1f9ef74b912d12709919153b8d1440a.tar.xz rsyslog-05efee80c1f9ef74b912d12709919153b8d1440a.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/msg.c')
0 files changed, 0 insertions, 0 deletions