[MERGE] Merged with server/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 28 Aug 2012 08:02:45 +0000 (10:02 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 28 Aug 2012 08:02:45 +0000 (10:02 +0200)
bzr revid: tde@openerp.com-20120828080245-vl0hm0ybk5ztvny8

1  2 
openerp/addons/base/security/ir.model.access.csv