Merge branch '2013.10' into 2014.11
[tine20] / .gitattributes
2016-08-19 Philipp SchüleMerge branch '2013.10' into 2014.11
2016-07-11 Cornelius Weiß0011852: add git merge driver for po/pot files