Merge branch 'lchevalier'
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Thu, 6 Jun 2013 20:47:14 +0000 (22:47 +0200)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Thu, 6 Jun 2013 20:47:14 +0000 (22:47 +0200)
commit56746fe72a690c7c36e655ef5188b15803be8922
tree75148272f8b99a06969f355e6769ebbc96a2ad8c
parent778dde18f7adf8cd2cc6e6ddae14429cdac3ca7a
parentf3a38665f97adea097eb9ed989ab0ae3d14c1711
Merge branch 'lchevalier'