From: Stéphane Jacob <jacou@melix.net>
Date: Thu, 21 Aug 2008 18:51:20 +0000 (+0200)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~522
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f497128a7c26c25a64e05453ea479520149e2cb7;p=platal.git

Merge commit 'origin/master' into fusionax

Conflicts:

	htdocs/xorg.php
---

f497128a7c26c25a64e05453ea479520149e2cb7
diff --cc htdocs/xorg.php
index 7d65d99,e43ef73..f730360
--- a/htdocs/xorg.php
+++ b/htdocs/xorg.php
@@@ -21,12 -21,11 +21,11 @@@
  
  require_once dirname(__FILE__).'/../include/xorg.inc.php';
  
- $platal = new Platal('auth', 'carnet', 'email', 'events', 'forums',
-                      'geoloc', 'lists', 'marketing', 'payment', 'platal',
-                      'profile', 'register', 'search', 'stats', 'admin',
-                      'newsletter', 'axletter', 'bandeau', 'survey',
-                      'fusionax',
-                      'gadgets', 'googleapps');
+ $platal = new Xorg('auth', 'carnet', 'email', 'events', 'forums',
+                    'geoloc', 'lists', 'marketing', 'payment', 'platal',
+                    'profile', 'register', 'search', 'stats', 'admin',
+                    'newsletter', 'axletter', 'bandeau', 'survey',
 -                   'gadgets', 'googleapps');
++                   'fusionax', 'gadgets', 'googleapps');
  
  if (!($path = Env::v('n')) || ($path{0} < 'A' || $path{0} > 'Z')) {
      $platal->run();