Revert "bug 1123: fixed merge conflicts on testserver"
[cacert-devel.git] / includes / .cvsignore
1 mysql.php
2 hash_password.php