Merge branch 'master' into wip_alan_T5681_fix_bootstrap4_detection
[roojs1] / resources_licence.txt
2010-04-06 www-datainitial import