Merge branch 'master' into hruid
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 27 Jul 2008 20:41:40 +0000 (22:41 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 27 Jul 2008 20:41:40 +0000 (22:41 +0200)
commita8b4ccb6c163277c49fb92427a7bb4ace8469660
treef3af9cd8e6e76db4ff7dc2e6a0d3151745038cce
parent5316f275c197ec7057457131e4aa5e0249c739fc
parent46f272feb613c57febf40a0f7bf6a721e439b73b
Merge branch 'master' into hruid
13 files changed:
classes/xnetsession.php
classes/xorgsession.php
modules/admin.php
modules/axletter.php
modules/carnet.php
modules/forums.php
modules/googleapps.php
modules/lists.php
modules/marketing.php
modules/newsletter.php
modules/platal.php
modules/profile.php
modules/register.php