Laurent Destailleur e5d5a25433 Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/core/modules/societe/doc/doc_generic_odt.modules.php		2014-07-05 11:54:02 +02:00
..
doc_generic_odt.modules.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-07-05 11:54:02 +02:00