From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun, 20 Apr 2008 09:44:59 +0000 (+0200)
Subject: Merge branch 'master' of /home/git/platal
X-Git-Tag: core/1.0.0~246
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=5d734a72d2470e6c4130ba15fcd15a57a8919cf3;p=platal.git

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

5d734a72d2470e6c4130ba15fcd15a57a8919cf3