From: Stéphane Jacob Date: Mon, 21 Mar 2011 12:25:02 +0000 (+0100) Subject: Merge branch 'xorg/f/xnet-accounts' into xorg/master X-Git-Tag: xorg/1.1.0~26 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=137f046d4f1d3fcfdd077a9ae0c7d7585eb0de3d;p=platal.git Merge branch 'xorg/f/xnet-accounts' into xorg/master --- 137f046d4f1d3fcfdd077a9ae0c7d7585eb0de3d