From: Stéphane Jacob <jacou@melix.net>
Date: Thu, 23 Oct 2008 19:59:08 +0000 (+0200)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~499
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4f35a3ca07b72943c53395ffc7ea49d493031940;p=platal.git

Merge commit 'origin/master' into fusionax

Conflicts:

	htdocs/xorg.php
---

4f35a3ca07b72943c53395ffc7ea49d493031940
diff --cc htdocs/xorg.php
index f730360,1c5b41a..6a31d1d
--- a/htdocs/xorg.php
+++ b/htdocs/xorg.php
@@@ -25,7 -25,7 +25,7 @@@ $platal = new Xorg('auth', 'carnet', 'e
                     'geoloc', 'lists', 'marketing', 'payment', 'platal',
                     'profile', 'register', 'search', 'stats', 'admin',
                     'newsletter', 'axletter', 'bandeau', 'survey',
-                    'fusionax', 'gadgets', 'googleapps');
 -                   'gadgets', 'googleapps', 'poison');
++                   'fusionax', 'gadgets', 'googleapps', 'poison');
  
  if (!($path = Env::v('n')) || ($path{0} < 'A' || $path{0} > 'Z')) {
      $platal->run();