mercedes508 wrote (26 Sep 2012 10:29:57 GMT) : > I'd like you (empowered people) to please merge master branch of
> mercedes508 repo, from this state:
> commit 4996ecd
It does not apply cleanly:
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/usb_installation.fr.po
Please merge the upstream master branch into your own,
resolve the conflicts as needed, and ask again :)
