merge
[odoo/odoo.git] / addons / association / security /
2010-12-30 husenmerged with trunk
2010-07-01 Harry (OpenERP)[MERGE]
2010-02-19 Harry (Open ERP)[RENAME+REMOVE] remove: base_module_merge, base_module_...