Laurent Destailleur 29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php

2013-01-13 19:33:54 +01:00

..

functions.sql

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-13 19:33:54 +01:00