Update to 9.3.0.2.1213
Merge branch 'nas4free 1213'

Conflicts:
	.svn/wc.db
	etc/inc/install.inc
	locale/fr.po