Revision bfac29c8f627a1102abcd4ed4ad73d8727b753d5

Committed on 05/09/2014 1:07 am by Simon Boyer <simon.boyer@openwide.fr> [GitHub Diff]

Conflict resolution with pull-request #2