Merge branch 'v1'
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 20 Sep 2013 12:45:59 +0000 (14:45 +0200)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 20 Sep 2013 12:45:59 +0000 (14:45 +0200)
commit37573554401b5a79fc965e123842fd25aec297b7
tree933b17cb483f237a7ef7d79261667dc74f5270d5
parent8529c6d7fd3b3c6df33507532270e08bc8a0efaa
parent982a4249f94b4187771f339727034b820808fb21
Merge branch 'v1'