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)
1  2 
include/vcard.inc.php
modules/xnetgrp.php

Simple merge
Simple merge