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

into develop

Conflicts:
	build/launchpad/README
This commit is contained in:
Laurent Destailleur
2012-01-30 00:44:29 +01:00

View File

@@ -55,4 +55,4 @@ a package onto LaunchPad