[MERGE] latest trunk
authorOlivier Dony <odo@openerp.com>
Tue, 6 Sep 2011 08:08:22 +0000 (10:08 +0200)
committerOlivier Dony <odo@openerp.com>
Tue, 6 Sep 2011 08:08:22 +0000 (10:08 +0200)
commitcaef9821a3487de37b9dc5a0e41e803630788c6c
treeea93d0331be0653c6a68b7e14a581fb53f0a914a
parenta0639a51a705d4678c3a6fd4653b20da314487d3
parenteab6a77a264491d8bbf1170876f285ffe9cb453d
[MERGE] latest trunk

bzr revid: odo@openerp.com-20110906080822-tyadkxvycrx7bl1d
openerp/addons/base/__openerp__.py
openerp/addons/base/ir/ir.xml
openerp/addons/base/res/__init__.py
openerp/addons/base/res/res_users.py
openerp/addons/base/res/wizard/__init__.py
openerp/addons/base/res/wizard/partner_wizard_massmail.py
openerp/addons/base/res/wizard/partner_wizard_massmail_view.xml
openerp/addons/base/security/ir.model.access.csv
openerp/osv/orm.py
openerp/tools/misc.py