From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 7 Dec 2008 15:19:52 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~90
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=34062b64fa9f161dc071527b2e864496555d598d;p=platal.git

Merge commit 'origin/master' into fusionax

Conflicts:

	modules/profile/jobs.inc.php

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

34062b64fa9f161dc071527b2e864496555d598d