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