From 3f31623b5a2d5a037da625f3101e3dc7bade2077 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 28 Jun 2011 15:06:26 +0000
Subject: [PATCH] Test: commit to git branch dev to sync in cvs

---
 htdocs/master.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 7e20464a925..2c622c94511 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2005 	   Simon Tosser         <simon@kornog-computing.com>
  * Copyright (C) 2006 	   Andre Cianfarani     <andre.cianfarani@acdeveloppement.net>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
@@ -30,7 +30,7 @@
  * 	\ingroup	core
  *  \brief      File that defines environment for all Dolibarr process (pages or scripts)
  * 				This script reads the conf.php file, init $lang, $db and empty $user
- *  \version    $Id$
+ *  \version    $Id: master.inc.php,v 1.349 2011/06/28 15:06:26 hregis Exp $
  */