[MERGE] v1->v2
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 12 Jul 2013 15:50:29 +0000 (17:50 +0200)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 12 Jul 2013 15:50:29 +0000 (17:50 +0200)
commita2147983aeaedced447a4742d32ad794aee750e0
tree2db22558b2273034c50fbc0541e7a1b6ddf289e3
parentbaf51c9a121b78425c3f70694fa6e2aa21924350
parent70dc5e7a62c25dae6396742d195e7d31ede63884
[MERGE]  v1->v2