Merge branch 'master' into cache
[mdictionary] / debian / docs