Merge branch 'master' into samesversion

[l2tpns.git] / THANKS

diff --git a/THANKS b/THANKS
index c39a07d..3ca2ab5 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -12,7 +12,7 @@ Yuri                       <yuri@actcom.net.il>
 Juergen Kammer             <j.kammer@eurodata.de>
 Simon Talbot               <simont@nse.co.uk>
 Jonathan McDowell          <noodles@earth.li>
 Juergen Kammer             <j.kammer@eurodata.de>
 Simon Talbot               <simont@nse.co.uk>
 Jonathan McDowell          <noodles@earth.li>

-Bjørn Augestad             <augestad@users.sourceforge.net>
+Bjørn Augestad             <augestad@users.sourceforge.net>

 Roberto Chostakovis        <rchostakovis@users.sourceforge.net>
 Jordan Hrycaj              <jordan@mjh.teddy-net.com>
 Vladislav Bjelic           <vladislav@gmail.com>
 Roberto Chostakovis        <rchostakovis@users.sourceforge.net>
 Jordan Hrycaj              <jordan@mjh.teddy-net.com>
 Vladislav Bjelic           <vladislav@gmail.com>


@@ -26,4 +26,9 @@ Jon Morby                  <jon@fido.net>
 Paul Martin                <pm@zetnet.net>
 Jonathan Yarden            <jyarden@bluegrass.net>
 Patrick Cole               <z@amused.net>
 Paul Martin                <pm@zetnet.net>
 Jonathan Yarden            <jyarden@bluegrass.net>
 Patrick Cole               <z@amused.net>

+Khaled Al Hamwi            <kh.alhamwi@gmail.com>
+Graham Maltby              <gmaltby+l2tpns@iig.com.au>

 Rhys Kidd                  <rhys.kidd@staff.westnet.com.au>
 Rhys Kidd                  <rhys.kidd@staff.westnet.com.au>

+Muhammad Tayseer Alquoatli <idoit.ief@gmail.com>
+Cyril Elkaim               <cyrelk@users.sourceforge.net>
+Geoffry D. Bennett         <g_bennett@users.sourceforge.net>