diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-21 12:23:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-21 12:23:41 +0200 |
| commit | ff446070be16b18e119873ed56e2c96e28b98514 (patch) | |
| tree | 4639428c29cf604a3955ea487813027141a585db /Makefile.am | |
| parent | 275595cdf8d5e18e665bfd4189f8061441595cce (diff) | |
| parent | 8cb6ec4cee79d41c30d7df38b58ab1f198ac8581 (diff) | |
| download | rsyslog-ff446070be16b18e119873ed56e2c96e28b98514.tar.gz rsyslog-ff446070be16b18e119873ed56e2c96e28b98514.tar.xz rsyslog-ff446070be16b18e119873ed56e2c96e28b98514.zip | |
Merge branch 'ietf-tls'
Conflicts:
ChangeLog
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions