Merge branch 'master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 26 Jul 2008 22:19:22 +0000 (00:19 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 26 Jul 2008 22:19:22 +0000 (00:19 +0200)
commit5316f275c197ec7057457131e4aa5e0249c739fc
tree47403951581bdfeb81cb9ac9549a1efd87308bbf
parent6f0ed746468397c663783a89f5b3b43f6fff77e2
parent5cc4b2bb2c8f57412571145781aa18abe2b80c18
Merge branch 'master' into hruid

Conflicts:
classes/xorgsession.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
classes/xorgsession.php