Merge branch 'platal-0.9.17' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Mon, 16 Jun 2008 15:46:54 +0000 (17:46 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Mon, 16 Jun 2008 15:46:54 +0000 (17:46 +0200)
commiteb0dd7adf65fadbee6521766fadf5a3ff8cec25e
tree97f828ea830243282605ebbbae2fe610f6a23a12
parent34ca204875b2ac19495c9f23844e02145a56824a
parent77e786e1d93d7017e611c42b6b4541d9ae2fbdbc
Merge branch 'platal-0.9.17' into hruid

Conflicts:
include/banana/forum.inc.php
modules/forums.php
modules/marketing.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
include/banana/forum.inc.php
modules/forums.php
modules/profile.php
modules/xnetgrp.php