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

Conflicts: test/phpunit/hudson_phpunittest.xml
2011-09-29 11:23:13 +02:00 · 2011-09-29 11:23:13 +02:00 · f579f5bf4b
commit f579f5bf4b
parent 39951571ea 1aac0ffddb
1 changed files with 1 additions and 1 deletions
--- a/test/phpunit/hudson_phpunittest.xml
+++ b/test/phpunit/hudson_phpunittest.xml
@ -75,4 +75,4 @@
    </exclude>
  </whitelist>
 </filter>
-</phpunit>
+</phpunit>