5a95ba
Merge branch 'master' of git://github.com/m-grimaud/opentoonz into m-grimaud-master # Conflicts: # README.md