From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 16 Feb 2011 21:17:19 +0000 (+0100)
Subject: Merge remote branch 'origin/core/1.1.2/maint' into core/master
X-Git-Tag: core/1.1.3~17
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=96dd0b0fbaaedf7d274cc919268fd717275d605f;p=platal.git

Merge remote branch 'origin/core/1.1.2/maint' into core/master
---

96dd0b0fbaaedf7d274cc919268fd717275d605f