Merge branch 'master' into wip_leon_T7861_Type_of_news_phase_1
[roojs1] / README.txt
2011-12-23 Alan KnowlesREADME.txt