Merge commit 'origin/platal-0.10.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 25 Jan 2009 21:15:31 +0000 (22:15 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 25 Jan 2009 21:15:31 +0000 (22:15 +0100)
commit59bec5bc5512a4f962ebac7b0346f59cdf56f901
treefe17328e6ec2436bf23280311d5c4f2934758fd8
parent4a71cf6706354c90259514915f71e01509fb2e8d
parent0e358d9a70b86ff65c177666f034b07103bc839d
Merge commit 'origin/platal-0.10.0'

Conflicts:

modules/platal.php

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