tree c7b411a29cead977afeac3fa20c826756e8eef32
parent 6271c45b27781e87251575c6e034d327f132b38e
parent d38361e2bff180bf9c1669ef741ed38e53eff97a
author Pierre CURTO <pcurto@somone.fr> 1466492583 +0200
committer Pierre CURTO <pcurto@somone.fr> 1466492583 +0200

fixed git conflicts