tabs -> 2 spaces
Merge branch 'dpaste'