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)
commit372fbb196e649a098e3c7df848f909849696ef65
tree1139a5e4991124f2ade1b4e550c91e10f0418b45
parentbc27980b1cd74417ced8d55469494cda462badfe
parent59bec5bc5512a4f962ebac7b0346f59cdf56f901
Merge commit 'origin/master' into fusionax
ChangeLog
include/notifs.inc.php
include/user.func.inc.php
templates/admin/index.tpl