Merge remote-tracking branch 'waldi/managed-rsyncd-ports-master'
authorPeter Palfrader <peter@palfrader.org>
Tue, 10 Jan 2017 19:34:03 +0000 (20:34 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 10 Jan 2017 19:34:03 +0000 (20:34 +0100)
commit4ca2318f824159566042e9ad02045d8f5f5d2baa
tree24a77687ee81986ae61c026b52a54a52ee22eec5
parent5a49857c46dda3d20196e45714fa82f035083d93
parent70e9c36fbacc4d33e03d615727beab55368fe2ab
Merge remote-tracking branch 'waldi/managed-rsyncd-ports-master'

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