Imported Upstream version 2.7

[ossec-hids.git] / CONTRIBUTORS

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
old mode 100755 (executable)
new mode 100644 (file)
index 3f20e2a..a42fcbc
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,5 +1,5 @@
-# @(#) $Id$ 
-# 
+OSSEC v2.7
+Copyright (C) 2012 Trend Micro Inc.
 
 Many thanks to everyone who contributed and helped with
 the ossec project. Below is the list of all the people
@@ -9,10 +9,21 @@ who helped us since our first release (0.1).
 -Development
   - Daniel B. Cid <dcid ( at ) ossec.net>
   - Jeremy Rossi <jrossi ( at ) ptnsecurity.com>
-  - Stephen Kreusch <stephen.kreusch at gmail.com>
+  - Michael Starks
+  - Dan Parriott <ddpbsd at gmail.com>
   - Meir Michanie <meirgotroot ( at ) gmail.com>
   - Slava Semushin <php-coder at altlinux.org>
   - Ahmet Ozturk <oahmet ( at )  metu.edu.tr>
+  - Scott R. Shinn 
+  - George Kargiotakis
+  - Jason Stelzer
+  - Xavier Mertens
+  - Stjepan Gros
+  - Brad Lhotsky
+  - cmlara
+  - Christian Gottsche (cgzones)
+  - Dominic
+  - JB Cheng
 
 
 -Testing/Patches and other contributions.
@@ -26,6 +37,7 @@ who helped us since our first release (0.1).
   - Andre Alexandre Gaio <aagaio ( at ) linwork.com.br>
   - Liliane A. Cid <liliane.cid ( at ) gmail.com> 
   - Marcus Maciel - <marcus @ ( at ) underlinux.com.br>
+  - Stephen Kreusch <stephen.kreusch at gmail.com>
   - Kayvan A. Sylvan <kayvan@ ( at ) sylvan.com>
   - Dianzhi Wang <wangdz@ ( at ) leadsec.com.cn>
   - Meir Michanie <meirgotroot@ ( at ) gmail.com>
@@ -36,13 +48,26 @@ who helped us since our first release (0.1).
   - Jorge Augusto Senger <jorge ( at ) br10.com.br> - ossec2mysql (contrib)
   - David J. Bianco <david at vorant.com>
   - Ivan Lotina <lotke at lotke.com>
-  - Michael Starks
   - Robert Millan [ackstorm] <rmillan at ackstorm.es>
   - Martin West <martin at objectgizmos.com>
   - Rafael Capovilla <under ( at ) underlinux.com.br>
+  - Florian Crouzqat
+  - Danny Fullerton
+  - Jeremy Hanmer
+  - Pepe Sanz
+  - Kat Fitzgerald
+  - Regis Houssin
+  - carlopmart
+  - Ash Kumar
   
   
 -Translations
+ 
+  -Dutch:
+  - Martijn de Boer - martijn ( at ) oceanius.com 
+
+  -Serbian:
+  - Maja Michanie - majam ( at ) riunx.com
 
   -Portuguese:
   - Daniel Barcellos <danielpoa.rs ( at ) gmail.com>