Merging 2.0.* et 2.2.*

	Home \| Summary \| Preview of the map \| Legend
	XOOPS Wish list
	Team Francophone contact@frxoops.org

3. Merging 2.0.* et 2.2.*

We lose too much time has develop 2 branches. It has absolutely no interest