[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam
[odoo/odoo.git] / openerp / db /
drwxr-xr-x   ..
-rw-r--r-- 1232 __init__.py