Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 27 Dec 2008 23:24:58 +0000 (00:24 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 27 Dec 2008 23:24:58 +0000 (00:24 +0100)
1  2 
classes/xorgsession.php

Simple merge