Merge branch 'master' of http://nubati.net/git/e-DoKo