Merge branch 'master' into en_3_modeles
authorLudovic CHEVALIER <l.chevalier@lespetitsdebrouillards-ra.org>
Thu, 12 Jan 2012 06:16:29 +0000 (07:16 +0100)
committerLudovic CHEVALIER <l.chevalier@lespetitsdebrouillards-ra.org>
Thu, 12 Jan 2012 06:16:29 +0000 (07:16 +0100)

Trivial merge