From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 9 Aug 2010 00:01:40 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into xnet_accounts
X-Git-Tag: xorg/1.1.0~26^2~28
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=25b261b1e0c8745d1f134f1a082e428ab50bd811;p=platal.git

Merge remote branch 'origin/master' into xnet_accounts
---

25b261b1e0c8745d1f134f1a082e428ab50bd811