[MERGE] master->v2
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 12 Jul 2013 08:26:24 +0000 (10:26 +0200)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 12 Jul 2013 08:26:24 +0000 (10:26 +0200)
commit7d2bf9c79c34286344a177be008b53b5aeb85970
tree2cb1ce8e99cf2307ddca9f8df7597d28dd53387f
parent8ae0a04170776c72cabf9720a9d3ca9ac8281a2f
parentf2c8d8d55f68f0559cb086feeedada608349fdf0
[MERGE] master->v2