diff options
| author | Michael Biebl <biebl@debian.org> | 2014-05-17 15:12:44 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-05-17 15:12:44 +0200 |
| commit | b53669c7ee499a891f11d91bb0f41cf331abe6aa (patch) | |
| tree | 75718dc537ba4995593c0582bc5eaaa08eb0527c /runtime/libgcry.c | |
| parent | fecd9e7338547fa500eabf6781851706afd64600 (diff) | |
| parent | 8f123c61700b71026c8e840b99dbf9e63c902cfd (diff) | |
| download | rsyslog-b53669c7ee499a891f11d91bb0f41cf331abe6aa.tar.gz | |
Merge branch 'master' into experimental
Conflicts:
debian/changelog
Diffstat (limited to 'runtime/libgcry.c')
0 files changed, 0 insertions, 0 deletions