SPIP-3.0.11
Merge branch 'release' into spip

Conflicts:
	CHANGELOG.txt
	svn.revision