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)
commit86aa4b4cccd01fa073f3d46bc7890bc0debb270c
tree47da730513250ba3aab151fc49d016e794cb83ae
parent27fd34d17259503612f191405473fc874ee48205
parent225b4e8076bb652982eb13c16b0f832a873c6b5e
Merge commit 'origin/fusionax' into account
classes/xorgsession.php