Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 25 Jan 2009 21:21:12 +0000 (22:21 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 25 Jan 2009 21:21:12 +0000 (22:21 +0100)
commit6d1747b3dbcf944c995dc2d87e8561c7a66f3aa6
tree7bc8c9e9d3468632202c6cd8a42fd5d257a7d6f8
parentdfcccfc0f277d90e5ef4af1e6b33ef3e1e76d6e2
parent48ad52ee05f372465c9cab21492be3212ae96736
Merge commit 'origin/fusionax' into account

Conflicts:

include/notifs.inc.php
modules/axletter.php
modules/newsletter.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
include/massmailer.inc.php
include/notifs.inc.php
include/user.func.inc.php
modules/axletter.php
modules/newsletter.php
modules/platal.php
modules/register.php
modules/xnetgrp.php
modules/xnetlists.php