[MERGE] from saas-3
authorChristophe Matthieu <chm@openerp.com>
Fri, 14 Feb 2014 10:04:24 +0000 (11:04 +0100)
committerChristophe Matthieu <chm@openerp.com>
Fri, 14 Feb 2014 10:04:24 +0000 (11:04 +0100)
commit373eadffb1165fdb645dc6da3f6be708d70e959a
tree61001b22b6a71ee256aca0a6ce7b6ddb87459e9a
parent441bbb23d764001f9933be840761a846a7a840c3
parent03ff1c53c6b60117e4df90c0613a1b422eabb309
[MERGE] from saas-3

bzr revid: chm@openerp.com-20140214100424-str26q27d169adwi