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)
commit6f0ed746468397c663783a89f5b3b43f6fff77e2
tree7ad7e16a288e9ffaa0b04c5a5c667147d2c7bc06
parent74f583b3308a61b2cdb5fa789595f322d8e190df
parente4501b5162ac1c70590205cc038db5d4b8188265
Merge branch 'master' into hruid
classes/xorgsession.php