Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 7 Dec 2008 15:19:52 +0000 (16:19 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 7 Dec 2008 15:19:52 +0000 (16:19 +0100)
commit34062b64fa9f161dc071527b2e864496555d598d
treed9c592b29161c5d92619a7b467e2b9b85d4d2588
parentcf81c359b80ad4280a0b3719e0a32c8adba2549d
parentdaa66175c727af26bbf0082a54d1f2048f405527
Merge commit 'origin/master' into fusionax

Conflicts:

modules/profile/jobs.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
modules/profile.php
templates/profile/jobs.job.tpl