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