Revision a75a3f80fcbfc118e7fa9bb02c4648d1f664ff0e

Committed on 03/02/2013 11:46 pm by Madeline VEYRENC <madeline.veyrenc@openwide.fr> [GitHub Diff]

Merge branch 'master' into master-github