Olivier Dony f0873dcb32 [MERGE] Sync with trunk - bunch of conflicts resolved ...

bzr revid: odo@openerp.com-20120803142450-97z551yam1js822h

2012-08-03 16:24:50 +02:00

..

ir.model.access.csv

[MERGE] Sync with trunk - bunch of conflicts resolved

2012-08-03 16:24:50 +02:00

mail_security.xml

[IMP] mail.thread: modified access rights. Users should now be able to delete their messages.

2012-04-05 18:47:19 +02:00