Merge branch 'master' into backbone
-rw-r--r-- 53 .gitignore
drwxr-xr-x - bin
drwxr-xr-x - data
drwxr-xr-x - debian
drwxr-xr-x - doc
drwxr-xr-x - lib
-rw-r--r-- 489 mdictionary.pro
drwxr-xr-x - packages
-rwxr-xr-x 122 setqmake
drwxr-xr-x - trunk