Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 1 Feb 2009 13:29:01 +0000 (14:29 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 1 Feb 2009 13:29:01 +0000 (14:29 +0100)
Conflicts:

core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
1  2 
include/vcard.inc.php

Simple merge