Merge remote-tracking branch 'waldi/keyring-ssl'
[mirror/dsa-puppet.git] / modules / roles / files / wiki /
2013-05-03 Peter Palfraderrsync for wiki