It should not be more difficult to merge master into the branch after
the commit(s) that resolve the whitespace.


---
This email is free from viruses and malware because avast! Antivirus protection is active.
http://www.avast.com