Merge branch 'master' into google
[mdictionary] / data / icons / 16x16 / staron.png
data/icons/16x16/staron.png