Laurent Destailleur dce9b96260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql

2012-07-25 12:20:45 +02:00

..

margins.lib.php

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2012-07-25 12:20:45 +02:00