From: Franck Villaume <franck.villaume@trivialdev.com>
Date: Sun, 10 Feb 2013 10:12:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/Branch_5_2'
X-Git-Tag: v5.3-rc1~1544
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=fdacc913b8e0eb5e53bcf59253452966f5d8baf1

Merge remote-tracking branch 'origin/Branch_5_2'
port from Branch_5_2: docman: fix tree

Conflicts:
	.gitattributes
	src/common/docman/DocumentManager.class.php
---

fdacc913b8e0eb5e53bcf59253452966f5d8baf1
diff --cc src/common/docman/DocumentManager.class.php
index 09551cd,a4625ae..a4c95a6
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@@ -3,7 -3,7 +3,8 @@@
   * FusionForge document manager
   *
   * Copyright 2011-2012, Franck Villaume - TrivialDev
 + * Copyright (C) 2012 Alain Peyrat - Alcatel-Lucent
+  * Copyright 2013, French Ministry of Education
   * http://fusionforge.org
   *
   * This file is part of FusionForge. FusionForge is free software;