[MERGE] from trunk

bzr revid: fva@openerp.com-20140120103034-78rddwe668y2w2un
This commit is contained in:
Frédéric van der Essen
2014-01-20 11:30:34 +01:00
File diff suppressed because it is too large Load Diff