Merge commit 'origin/platal-0.10.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Dec 2008 14:50:51 +0000 (15:50 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Dec 2008 14:50:51 +0000 (15:50 +0100)
commitafe36ba2f02db02ff1cf7d6c20fd995c30cc29a6
treecf578f0be54af4ff48e13fd64119d4da0bd7570b
parent3d1a2c7d95b71857f77ab08c3ce8104833ad3c66
parenta25cdc91a68f7d960496d4b7e4de158f8e1bf752
Merge commit 'origin/platal-0.10.0'

Conflicts:

core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
core
include/geoloc.inc.php