removes phpdocumentor from dev requirements
[tine20] / .gitattributes
2016-07-11 Cornelius Weiß0011852: add git merge driver for po/pot files