From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 7 Apr 2011 20:17:51 +0000 (+0200)
Subject: Merge branch 'core/1.1.3/maint' into core/master
X-Git-Tag: core/1.1.4~6
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;ds=sidebyside;h=13cec5adcabc015959a87a75ef67cc354242a6bd;hp=13cec5adcabc015959a87a75ef67cc354242a6bd;p=platal.git

Merge branch 'core/1.1.3/maint' into core/master
---