Merge branch '7.0'
-rw-r--r-- 20 .gitattributes
-rw-r--r-- 11 .gitignore
-rw-r--r-- 1161 __init__.py
-rw-r--r-- 1987 __openerp__.py
drwxr-xr-x - data
drwxr-xr-x - i18n
-rw-r--r-- 22150 remembership.py
drwxr-xr-x - security
drwxr-xr-x - view
drwxr-xr-x - wizard