Merge branch 'master' of git.acceleration.net:/var/git/clsql