Merge branch 'master' of /var/cache/git/aymargeddon/current
[aymargeddon/current.git] / .gitignore
1 *~
2 [+,]*