Merge branch 'master' into cache
[mdictionary] / trunk /
drwxr-xr-x   ..
drwxr-xr-x - src
drwxr-xr-x - tests
-rw-r--r-- 140 trunk.pro