Merge branch 'master' into HEAD
[mirror-admin] / .gitignore
1 log
2 var
3 etc/krb4.keytab