Revision d76900f4019cebd3c85dbc053bb89a0ebe344ce1

Committed on 12/12/2012 2:18 am by Simon Boyer <simon.boyer@openwide.fr> [GitHub Diff]

Conflicts resolution