Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.… · Dolibarr/dolibarr@b58a296 · GitHub

Commit

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.…

Browse files

…git into develop

Conflicts:
	htdocs/product/admin/product_tools.php

Loading branch information

hregis committed May 22, 2012

2 parents d7d26b9 + 569a315 commit b58a296