Merge remote branch 'origin/platal-1.0.0'

author Stéphane Jacob <sj@m4x.org>

Sun, 29 Aug 2010 17:38:40 +0000 (19:38 +0200)

committer Stéphane Jacob <sj@m4x.org>

Sun, 29 Aug 2010 17:38:40 +0000 (19:38 +0200)
author Stéphane Jacob <sj@m4x.org>
Sun, 29 Aug 2010 17:38:40 +0000 (19:38 +0200)
committer Stéphane Jacob <sj@m4x.org>
Sun, 29 Aug 2010 17:38:40 +0000 (19:38 +0200)
diff --cc classes/user.php
Simple merge
diff --cc include/validations/names.inc.php
Simple merge
diff --cc modules/profile/general.inc.php
Simple merge
author	Stéphane Jacob <sj@m4x.org>
	Sun, 29 Aug 2010 17:38:40 +0000 (19:38 +0200)
committer	Stéphane Jacob <sj@m4x.org>
	Sun, 29 Aug 2010 17:38:40 +0000 (19:38 +0200)
		1	2
classes/user.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/validations/names.inc.php	patch \|	diff1 \|	diff2 \|	blob \| history
modules/profile/general.inc.php	patch \|	diff1 \|	diff2 \|	blob \| history