From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 9 Sep 2007 17:43:07 +0000 (+0200)
Subject: Merge branch 'profile_edit'
X-Git-Tag: xorg/0.9.15~174
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=be6ab042d1dc34d9e42557281b48dd8da400231b;p=platal.git

Merge branch 'profile_edit'

Conflicts:

	htdocs/css/default.css
	htdocs/css/keynote.css
	htdocs/css/openweb.css
	include/platal.inc.php
	modules/profile/assign_adresses.inc.php
	modules/profile/assign_poly.inc.php
	modules/profile/get_adresses.inc.php
	modules/profile/get_deco.inc.php
	modules/profile/get_general.inc.php
	modules/profile/get_mentor.inc.php
	modules/profile/update_adresses.inc.php
	modules/profile/verif_adresses.inc.php
	modules/profile/verif_general.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

be6ab042d1dc34d9e42557281b48dd8da400231b