From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 11 Aug 2010 15:10:13 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into xnet_accounts
X-Git-Tag: xorg/1.1.0~26^2~27
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=150f29f1d0b305fc57d48da0fca13c19e176ca0e;p=platal.git

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

150f29f1d0b305fc57d48da0fca13c19e176ca0e