Merge branch 'master' into patch-1
[grml.org.git] / .gitignore
1 *.swp
2 *.old
3 *.old2
4 *.old.php