Merge branch 'master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 20 Jul 2008 21:12:26 +0000 (23:12 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 20 Jul 2008 21:12:26 +0000 (23:12 +0200)
1  2 
classes/xorgsession.php

Simple merge