updated
Merge branch 'master' of ssh://git.mageia.org/software/adminpanel