Merge commit 'origin/master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 20 Jul 2008 01:53:43 +0000 (03:53 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 20 Jul 2008 01:53:43 +0000 (03:53 +0200)
commitc886c975766cc8c3b53d3d73a4bf592824577d93
tree4480537738d2c593f3815066c00ef2ac92408f33
parent702320204661a870319c2d60a4803f2ff6d27df9
parent6eeb600e8d56aa77188d2618928109a876afb289
Merge commit 'origin/master' into hruid

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
modules/admin.php
modules/carnet.php
modules/lists.php
modules/marketing.php
modules/platal.php
modules/xnetgrp.php