erreur
authormarc.nachin <you@example.commarc.nachin@auf.org>
Wed, 29 Jan 2014 17:24:08 +0000 (18:24 +0100)
committermarc.nachin <you@example.commarc.nachin@auf.org>
Wed, 29 Jan 2014 17:24:08 +0000 (18:24 +0100)

Trivial merge