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)
commit25b261b1e0c8745d1f134f1a082e428ab50bd811
treeb37c2421b1fb09811989236c355bdf9ccbbf8b5d
parent9a7f3d8ec9c2a69584f2bb5cb0c50154f1cbb704
parentbd4540a2512daf4e6219f2cf01a56e080a9e9aaa
Merge remote branch 'origin/master' into xnet_accounts
modules/xnet.php
templates/xnetgrp/membres-del.tpl