Laurent Destailleur 37b0780523 Merge remote-tracking branch 'origin/3.4' into 3.5 ...

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/ecm/tpl/builddatabase.tpl.php
	htdocs/fourn/commande/liste.php
	htdocs/product/admin/product_tools.php

2013-12-08 00:42:36 +01:00

..

builddatabase.tpl.php

Merge remote-tracking branch 'origin/3.4' into 3.5

2013-12-08 00:42:36 +01:00