Whitespace fixes
Merge pull request #1862 from owncloud/whitespace-cleanup

Whitespace cleanup