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