[MERGE] trunk-acl-thu (check read/write access restrictions on fields with a groups...
authorRaphael Collet <rco@openerp.com>
Mon, 17 Dec 2012 10:15:28 +0000 (11:15 +0100)
committerRaphael Collet <rco@openerp.com>
Mon, 17 Dec 2012 10:15:28 +0000 (11:15 +0100)
bzr revid: rco@openerp.com-20121217101528-nt5hsjvvodaap57m

1  2 
openerp/addons/base/base_demo.xml
openerp/osv/orm.py

Simple merge
Simple merge