cb 21/04/2013
Merge branch 'master' of github.com:cbillon/scripts