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)
* waldi/keyring-ssl:
  Enable rsync-ssl on keyring.debian.org


Trivial merge