Merge remote-tracking branch 'waldi/managed-rsyncd-ftp-master'
authorPeter Palfrader <peter@palfrader.org>
Tue, 10 Jan 2017 20:49:24 +0000 (21:49 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 10 Jan 2017 20:49:24 +0000 (21:49 +0100)
commit27c2183e590e6eff19e531297422a35fda068f90
tree0dff6a2c6ec6ad782962fc881809c75abe926dd8
parenta03afdf2c6a364c555baf2e6319c1c4c499e49a0
parentc71e5dd36c8aca9252a06a10e0322374911b2c27
Merge remote-tracking branch 'waldi/managed-rsyncd-ftp-master'

* waldi/managed-rsyncd-ftp-master:
  Use archvsync managed secrets files for rsyncd on ftp-master