From: Thomas Minvielle <thomas.minvielle@polytechnique.org>
Date: Sat, 7 Jun 2014 06:28:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into manageurs
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmanageurs;p=platal.git

Merge remote-tracking branch 'origin/master' into manageurs
---

39a599e44506a7a43252f5b69052eba9292b549d