Merge 2.4

doc/install/.htpasswd

-admin:$apr1$l63.....$tCO2YgYkr.oq.ShBECwUH1

htdocs/install/inc.php

@@ -24,7 +24,7 @@
 		\version    $Id$
 */
 
-define('DOL_VERSION','2.4-beta');	// Also defined in htdocs/master.inc.php
+define('DOL_VERSION','2.4');	// Also defined in htdocs/master.inc.php
 
 require_once('../translate.class.php');
 require_once('../lib/functions.lib.php');

htdocs/master.inc.php

@@ -29,7 +29,7 @@
    \version    $Id$
 */
 
-define('DOL_VERSION','2.4-beta');	// Also defined in htdocs/install/inc.php
+define('DOL_VERSION','2.4');	// Also defined in htdocs/install/inc.php
 define('EURO',chr(128)); 
 
 // La fonction clearstatcache ne doit pas etre appele de manire globale car ralenti.