Merge remote-tracking branch 'waldi/keyring-ssl'
authorPeter Palfrader <peter@palfrader.org>
Tue, 7 Feb 2017 20:37:19 +0000 (21:37 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 7 Feb 2017 20:37:19 +0000 (21:37 +0100)
commit17ee2b26f9eb4a03b48db6aef26894e042736c5f
treecb0fe9f9a09479daa6b2ee8a2df316e8920da9ee
parentbb6f9f0d6630835690b6a13335b4b2fd70643542
parentd83be952c2087c71d36fd564016bba01a55977cd
Merge remote-tracking branch 'waldi/keyring-ssl'

* waldi/keyring-ssl:
  Enable rsync-ssl on keyring.debian.org