From: Stéphane Jacob <jacou@melix.net>
Date: Mon, 19 May 2008 23:32:41 +0000 (+0200)
Subject: Merge branch 'master' of /home/git/platal
X-Git-Tag: core/1.0.0~178
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=214d92b0cef6c4298a2769242ebae5c31e27955a;p=platal.git

Merge branch 'master' of /home/git/platal
---

214d92b0cef6c4298a2769242ebae5c31e27955a