Replaced all tabs by spaces
Replaced all tabs by spaces
Fixed indents
Fixed ident
Moar indention
Fixed collision
Merge branch 'master' of https://github.com/rob19780114/merge-maven-plugin.git
Fixed author email,
Fixed idention
Fixed author email,
Fixed moar indention