Merge remote branch 'origin/master' into xnet_accounts
authorStéphane Jacob <sj@m4x.org>
Mon, 9 Aug 2010 00:01:40 +0000 (02:01 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 9 Aug 2010 00:01:40 +0000 (02:01 +0200)
1  2 
modules/xnet.php
templates/xnetgrp/membres-del.tpl

Simple merge
Simple merge