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

Conflicts: ChangeLog htdocs/admin/dict.php htdocs/comm/prospect/fiche.php
2013-04-17 23:15:57 +02:00
parent e505ce3e7d 21a1441a80
commit ff2adc40a4
2 changed files with 6 additions and 2 deletions
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -443,4 +443,4 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>