Merge branch 'master' into feature/gnumake4
tree9075c08064c1e0bd980ec908440413b899ffca84
lrwxrwxrwx 63 .gitattributes -> /striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
-rw-r--r-- 246 .gitignore
drwxr-xr-x - filter
drwxr-xr-x - hwpfilter
drwxr-xr-x - lotuswordpro
drwxr-xr-x - oox
drwxr-xr-x - unoxml
drwxr-xr-x - writerfilter
drwxr-xr-x - writerperfect
drwxr-xr-x - xmerge