Merge branch 'platal-0.9.16'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 25 May 2008 12:47:54 +0000 (14:47 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 25 May 2008 12:47:54 +0000 (14:47 +0200)
commit58d1d33c646a2c67244dd12398b993ce850b9b69
treee819fe6aaf7034a7b9ab3bc9da63d0a9b49027a2
parent5e35e81b42eef42eba4ef31e4ffc771bb5d8f2f2
parent77c55887a8a9635bee338a09ec3a6a097b40f039
Merge branch 'platal-0.9.16'

Conflicts:

modules/auth/auth.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
modules/email.php