Just retab to 4-spaces. Ignore.
Clear trailing whitespace. Ignore.
Merge branch 'master' of github.com:cosimo/perl5-locale-po

Conflicts:
	lib/Locale/PO.pm

Conflicts were just the perltidy diff.