Merge branch 'xorg/f/xnet-accounts' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 21 Mar 2011 12:25:02 +0000 (13:25 +0100)
committerStéphane Jacob <sj@m4x.org>
Mon, 21 Mar 2011 12:25:02 +0000 (13:25 +0100)
commit137f046d4f1d3fcfdd077a9ae0c7d7585eb0de3d
treea9f2ab5ccc5fcf10a4fa723c86f82b2903e548f1
parente23d21c1588a9ffa0697aef08e9ebdada4fe167e
parent4a5e7d4bb8e43e68051bfb3a81cb5124eed3ec40
Merge branch 'xorg/f/xnet-accounts' into xorg/master
classes/userfilter/conditions.inc.php