From: Stéphane Jacob <sj@m4x.org>
Date: Tue, 28 Dec 2010 19:33:20 +0000 (+0100)
Subject: Merge branch 'core/maint' into core/master
X-Git-Tag: core/1.1.2~17
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=15ba1697972827b89892b9866c4f6c0859c67ce8;hp=15ba1697972827b89892b9866c4f6c0859c67ce8;p=platal.git

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