Merge branch 'master' into openid
[rails.git] / .gitignore
1 log
2 tmp
3 .DS_Store