Merge branch '2016.11' into 2016.11-develop
[tine20] / .gitattributes
1 *.po merge=pofile
2 *.pot merge=pofile