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