Christophe Simonis f9072c789d [MERGE] forward port of branch 9.0 up to bfbe2d6 ...

# Conflicts:
#	addons/marketing/i18n/es_PE.po
#	addons/marketing/i18n/hu.po

2016-06-14 19:27:16 +02:00

..

changelog

…

compat

…

control

[MERGE] forward port of branch 9.0 up to bfbe2d6

2016-06-14 19:27:16 +02:00

copyright

…

init

…

install

…

logrotate

…

openerp-server.conf

…

postinst

[FIX] packaging: debian: update-python-module is no more

2016-06-10 17:22:03 +02:00

postrm

…

rules

…