Merge branch 'master' into membership_wizard
-rw-r--r-- 130 __init__.py
-rw-r--r-- 991 __openerp__.py
-rw-r--r-- 380 bikecoop_l10n_fr.py
drwxr-xr-x - data
drwxr-xr-x - demo
drwxr-xr-x - view
drwxr-xr-x - wizard