From 0100f212812864c8ce79fd614cf992f5b7697bea Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Tue, 31 Mar 2015 15:47:33 +0200
Subject: [PATCH] Adding AUTHORS

Conflicts:
	AUTHORS
---
 AUTHORS | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index fe5d87767..77b9b6429 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -109,7 +109,7 @@ documentation and additional help.
   Various patches from debian-edu
   Apache 2.4 support
   Mcrypt decrypt enhancement
-  Browsing inactive tab 
+  Browsing inactive tab
 
 * Jeremy Williame <williamejeremy@hotmail.com>
   Cleanup and writer of the FusionDirectory doxygen api documentation
@@ -138,9 +138,6 @@ documentation and additional help.
 * Stefan Krüger <shadow_7@gmx.net>
   Add support for various database to the rsyslog plugin
 
-* Fabien Brachere <fabien.brachere@e-tera.com>
-  Fix support for special caracters in password
-
 * Guillaume Chéramy <guillaume@cheramy.name>
   Patches for the template system
 
@@ -155,3 +152,15 @@ documentation and additional help.
 
 * Guillard Olivier <fd@guillard.nom.fr>
   SSH plugin key storage problem reporter
+
+* Fabien Brachere <fabien.brachere@e-tera.com>
+  Fix support for special caracters in password
+
+* Arnaud Patard <apatard@hupstream.com>
+  Fix for Invalid uri in the password recovery mail
+
+* Adrian Reyer <are+fd@lihas.de>
+  Modifier for templates to convert german umlauts to 7-bit ASCII
+
+* Samuel Bosquin samuel.bosquin@ibcp.fr
+  Plugin FAI - LVM partitions
-- 
GitLab