Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 25 Jan 2009 21:15:56 +0000 (22:15 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 25 Jan 2009 21:15:56 +0000 (22:15 +0100)
1  2 
ChangeLog
include/notifs.inc.php
include/user.func.inc.php
templates/admin/index.tpl

diff --cc ChangeLog
Simple merge
Simple merge
Simple merge
Simple merge