Merge branch 'master' into v7
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 16 Nov 2012 10:06:36 +0000 (11:06 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 16 Nov 2012 10:06:36 +0000 (11:06 +0100)
commit886afc52faaef84595be2a2ccffb951a018298dd
treef70717a36087355a435c0b98533ce0987c029561
parente9e750e86566fb1a26d62a1e224112ccb9db4462
parentcb41598a3a8df739b22b1f77314911914573c0de
Merge branch 'master' into v7