Merge branch 'master' into sslres
[ashd.git] / AUTHORS