Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 14 Nov 2008 20:07:29 +0000 (21:07 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 14 Nov 2008 20:07:29 +0000 (21:07 +0100)
commit065cd7ed086ef7806f294f92e675f16232704d6a
tree37e2e21c3eaff0e46dd0e163ab5731550df1fc90
parent4f35a3ca07b72943c53395ffc7ea49d493031940
parent8d6bf46f063e347e1102ef786ba0f83ffa2146a4
Merge commit 'origin/master' into fusionax

Conflicts:

ChangeLog
htdocs/xorg.php
templates/profile/general.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
ChangeLog
htdocs/xorg.php