Merge branch 'master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 13 Jul 2008 22:04:29 +0000 (00:04 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 13 Jul 2008 22:04:29 +0000 (00:04 +0200)
commitbd4f648ba40d48ad6bf8b60d5707f2a9324c450c
treea3e8b7cf0eb3266e46bd05ce98109857cdc1b3a1
parentc72cef4cd6acfacbfdc72f0b4173237228df6b68
parent998c070f7e569ac449a9aa12b78cbe062f1157d6
Merge branch 'master' into hruid
include/banana/forum.inc.php
include/banana/ml.inc.php
include/banana/moderate.inc.php
include/vcard.inc.php
modules/lists.php
modules/marketing.php