Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/web/clavettes
authorJohan GIRAUD <johangiraud1@gmail.com>
Wed, 21 Jan 2015 14:40:55 +0000 (15:40 +0100)
committerJohan GIRAUD <johangiraud1@gmail.com>
Wed, 21 Jan 2015 14:40:55 +0000 (15:40 +0100)

Trivial merge