Merge branch 'master' into membership_grouped
-rw-r--r-- 11 .gitignore
-rw-r--r-- 1163 __init__.py
-rw-r--r-- 1807 __openerp__.py
drwxr-xr-x - data
drwxr-xr-x - i18n
-rw-r--r-- 7515 remembership.py
drwxr-xr-x - view