[MERGE] Forward-port saas-3 up to 7273474
authorOlivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 21:14:59 +0000 (23:14 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 21:14:59 +0000 (23:14 +0200)
commitb7814943c3be176c78846de866c6581a95d1a9ab
treeb7a938745560c6b41d62397fa9cd3f12e4ca3a74
parentb4cbef43330ab7ae83c080934cb376352cfaeac3
parent7273474d6591f2dc62423c92eb5ec661d597716c
[MERGE] Forward-port saas-3 up to 7273474
addons/website/views/website_templates.xml
openerp/osv/orm.py