Resolve conflicts -- Jason, please check that the authentication logic is still good.
[mkws-moved-to-github.git] / .gitignore
1 *~