Merge branch 'master' into v7
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 16 Nov 2012 09:24:16 +0000 (10:24 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 16 Nov 2012 09:24:16 +0000 (10:24 +0100)
commit57c488c7cff3094bb39398610bca8f22a0b0de87
treed8c3bec03162dd91ed1f8f77ebd9d1fe9147d04d
parentd0eae9cc0ea0698980705e31737d81b00a2e7b0e
parent24f33a9751b186d07035e094cade52be3e49c1a8
Merge branch 'master' into v7