[MERGE] forward port of branch 7.0 up to revid 5270 chs@openerp.com-20140403084524...
-rw-r--r-- 145 .bzrignore
-rw-r--r-- 34927 LICENSE
-rw-r--r-- 34520 LICENSE.web
-rw-r--r-- 262 MANIFEST.in
-rw-r--r-- 1291 README
-rw-r--r-- 200 README.web
drwxr-xr-x - addons
drwxr-xr-x - debian
drwxr-xr-x - doc
drwxr-xr-x - history
drwxr-xr-x - install
-rwxr-xr-x 113 oe
-rw-r--r-- 1991 oe-bash-completion
-rwxr-xr-x 191 openerp-long-polling
-rwxr-xr-x 155 openerp-server
-rw-r--r-- 1760 openerp-wsgi.py
drwxr-xr-x - openerp
drwxr-xr-x - openerpcommand
drwxr-xr-x - scripts
-rw-r--r-- 95 setup.cfg
-rw-r--r-- 14114 setup.nsi
-rw-r--r-- 6227 setup.py
-rw-r--r-- 673 setup_rpm.sh
drwxr-xr-x - win32