SPIP-3.0.6
Merge branch 'release' into spip

Conflicts:
	CHANGELOG.txt
	ecrire/inc/session.php
	svn.revision