Merge branch 'master' into v7
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 16 Nov 2012 10:18:45 +0000 (11:18 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 16 Nov 2012 10:18:45 +0000 (11:18 +0100)
commitf202f8ab773c3771b0b480295855ce4f489f3240
treed695e9bdbc55263f28554d0de2abb47a407422ba
parent57c488c7cff3094bb39398610bca8f22a0b0de87
parent40f4c43f7e81a2cc771c087b67e17689b0605b90
Merge branch 'master' into v7