Merge pull request #913 from krlmlr/gitattributes-NEWS

Avoid merge conflicts in NEWS file
fix vertical justification for rotated text