diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-10-01 17:56:20 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-10-01 17:56:20 +0400 |
| commit | c046f7bcc92281465917e026f83fd0d38569cb06 (patch) | |
| tree | 711f61cf319e171a5f41c469ef30e3298c8917f8 /plugins/omrelp/Makefile.am | |
| parent | 17262528e2277c3d069c4a29ed098830d4fdbc08 (diff) | |
| parent | 7ec8c6d6f9114765775ea5100af5b0b20af4502e (diff) | |
| download | rsyslog-c046f7bcc92281465917e026f83fd0d38569cb06.tar.gz | |
Merge branch 'master' of git://anonscm.debian.org/collab-maint/rsyslog
Conflicts:
debian/changelog
debian/patches/series
debian/rules
Diffstat (limited to 'plugins/omrelp/Makefile.am')
0 files changed, 0 insertions, 0 deletions