Merge commit 'origin/master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 24 Aug 2008 20:29:15 +0000 (22:29 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 24 Aug 2008 20:29:15 +0000 (22:29 +0200)
commitde14933c384281bfc5571b8b3d7d7ac94b04bc48
treebe45fe5bdbc18ad5de3e6c5823809f5bc1036bec
parent2c141369432429dd14d641483b2ce6449b53a0fe
parent03c0a3a7ae88f2c38702325824f7a41395bf64a3
Merge commit 'origin/master' into hruid
modules/carnet.php
modules/forums.php
modules/lists.php
modules/register.php
modules/search.php