[MERGE]sync with trunk
authorsgo@tinyerp.com <>
Wed, 26 Jun 2013 11:16:33 +0000 (16:46 +0530)
committersgo@tinyerp.com <>
Wed, 26 Jun 2013 11:16:33 +0000 (16:46 +0530)
bzr revid: sgo@tinyerp.com-20130506123433-mbbw44o0nj5224jm
bzr revid: sgo@tinyerp.com-20130605072109-913cerck1xz2thdb
bzr revid: sgo@tinyerp.com-20130610052931-x6r3qt920vgafiuv
bzr revid: sgo@tinyerp.com-20130626111633-xatnf2mkwjqv93ti

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