Merge branch 'master' into v7
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Mon, 19 Nov 2012 08:12:01 +0000 (09:12 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Mon, 19 Nov 2012 08:12:01 +0000 (09:12 +0100)
commit8482f6d5da2c66c0530fce09a2d86d69fe26f7b5
treea72446fae0b907566d97591c42ae521dcf77a9cb
parent886afc52faaef84595be2a2ccffb951a018298dd
parent74ab7510b9ea49dbec8531923a04cb4c12cda4d4
Merge branch 'master' into v7