diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
| commit | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (patch) | |
| tree | be7d18baa836e9df166ec63f6c9fe6f94bb84b40 /test/integration/keyrings/test-master-keyring.sec | |
| parent | a5e790985752c6820e08e7a7e650e1607fa826e4 (diff) | |
| parent | fc104da6a583736223b2f941e43a05ea26b63a7d (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-private/private-list.cc
configure.ac
debian/apt.install.in
debian/changelog
Diffstat (limited to 'test/integration/keyrings/test-master-keyring.sec')
| -rw-r--r-- | test/integration/keyrings/test-master-keyring.sec | bin | 0 -> 2501 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/test/integration/keyrings/test-master-keyring.sec b/test/integration/keyrings/test-master-keyring.sec Binary files differnew file mode 100644 index 000000000..9cb33176c --- /dev/null +++ b/test/integration/keyrings/test-master-keyring.sec |