Merge commit 'origin/master' into fusionax
authorStéphane Jacob <jacou@melix.net>
Thu, 23 Oct 2008 19:59:08 +0000 (21:59 +0200)
committerStéphane Jacob <jacou@melix.net>
Thu, 23 Oct 2008 19:59:08 +0000 (21:59 +0200)
commit4f35a3ca07b72943c53395ffc7ea49d493031940
tree581474a518cb3139b3e19ca71f0eb9e99ad7be3b
parentfb2c09c9676d912c90a77135610f4cfe8c339f6b
parent33b47675b5597652fb4c3b770401c58803d2a0cc
Merge commit 'origin/master' into fusionax

Conflicts:

htdocs/xorg.php
htdocs/xorg.php
include/validations.inc.php