Merge branch 'master' into google
[mdictionary] / trunk / src / plugins /
drwxr-xr-x   ..
drwxr-xr-x - google
-rw-r--r-- 139 plugins.pro
drwxr-xr-x - xdxf