ajout talk yapc sur marc::mir
Merge branch 'master' of gh:unistra/unistra.github.com