Merge branch 'master' into feature/gnumake4
tree87857afc663c7e8d891fec4dc275e8b86a1b2b8d
lrwxrwxrwx 63 .gitattributes -> /striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
-rw-r--r-- 246 .gitignore
drwxr-xr-x - animations
drwxr-xr-x - sd
drwxr-xr-x - slideshow