EloiZ/Defi — pull request #2 by passavent7 (2014-11-11 18:43:54+00:00)
Title: friends

merge de master et friends