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)
commit524d1205c09d3f8e14a5751b2cbbce7e2fd23008
tree949eb52cf3420f0eb99c0d3c3accbfbdb1c1c7c9
parent08c91036c98078a4253833b20afcc9ebe3b7cfa3
parent4a55e7da9dd68b35034d207a25d8ffb292f30403
Merge commit 'origin/fusionax' into account

Conflicts:

core

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