Merge branch 'platal-0.9.17'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 27 Jun 2008 22:08:34 +0000 (00:08 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 27 Jun 2008 22:08:34 +0000 (00:08 +0200)
commit1c82f959c6e69a5a979e46e530872685106f9103
tree1f17a75221c27a19db62504fd5ffe6c85a4f1ff2
parent01a5b3330f7896c20bbb630aaf13742da54a877b
parent75cdd608d028d33a0efd6f83af4907149c9d9e1f
Merge branch 'platal-0.9.17'
include/vcard.inc.php
modules/xnetgrp.php