Merge branch 'master' of openobject-server into mdv-gpl3
-rw-r--r-- 6 .gitignore
-rw-r--r-- 262 MANIFEST.in
-rw-r--r-- 1120 README
drwxr-xr-x - addons
drwxr-xr-x - bin
drwxr-xr-x - doc
drwxr-xr-x - man
drwxr-xr-x - pixmaps
-rw-r--r-- 497 rpminstall_sh.txt
-rw-r--r-- 271 setup.cfg
-rw-r--r-- 9859 setup.nsi
-rwxr-xr-x 7335 setup.py
drwxr-xr-x - win32