[MERGE] Forward-port saas-3 up to 9b55532
authorOlivier Dony <odo@openerp.com>
Thu, 14 Aug 2014 12:37:42 +0000 (14:37 +0200)
committerOlivier Dony <odo@openerp.com>
Thu, 14 Aug 2014 12:37:42 +0000 (14:37 +0200)
commit9a84d55036bba1a8268934e3935c77c976f98ed4
tree4c4ed8d2ff1329c50a336ba269ac318b53308783
parent65b6b81d2c94312f29fb46eedcf16853cf3dacc0
parent9b5553286a4dde44ba6f4dcafa4479105ac6d20b
[MERGE] Forward-port saas-3 up to 9b55532
addons/web/controllers/main.py
openerp/tools/translate.py