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