merge with master and fix 4 conflicts by hand
[ardour.git] / templates /
drwxr-xr-x   ..
-rw-r--r-- 1167 wscript