From 49a30d49f37148db1be105615668998c8fb8ea86 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Tue, 16 Mar 2010 17:49:39 +0100
Subject: Update contributors for 2.0.6

---
 AUTHORS   | 96 +++++++++++++++++++++++++++++++++------------------------------
 ChangeLog | 19 ++++++++-----
 2 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 910873b..d0f4976 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,53 +1,57 @@
 Contributors
 ============
 
-Alexej Lotz
-Asko Kauppi
-Barak Amar
-Bernd Prager
-Chris Wong
-Conrad D. Steenberg
-Dhruva Krishnamurthy
-Dirk O. Kaar
-Erich Heine
-Erik Rigtorp
-Frank Denis
-George Neill
-Gonzalo Diethelm
-Joe Thornber
-Jon Dyte
-Kamil Shakirov
-Martin Hurton
-Martin Lucina
-Martin Sustrik
-Matus Hamorsky
-McClain Looney
-Pavel Gushcha
-Pavol Malosek
-Steven McCoy
-Tamara Kustarova
-Tero Marttila
-Terry Wilson
-Vitaly Mayatskikh
+Alexej Lotz <alexej.lotz@arcor.de>
+Asko Kauppi <askok@dnainternet.net>
+Barak Amar <barak.amar@gmail.com>
+Bernd Prager <bernd@prager.ws>
+Chris Wong <chris@chriswongstudio.com>
+Conrad D. Steenberg <conrad.steenberg@caltech.edu>
+Dhruva Krishnamurthy <dhruva@ymail.com>
+Dirk O. Kaar <dok@dok-net.net>
+Erich Heine <sophacles@gmail.com>
+Erik Rigtorp <erik@rigtorp.com>
+Frank Denis <zeromq@pureftpd.org>
+George Neill <georgen@neillnet.com>
+Gonzalo Diethelm <gdiethelm@dcv.cl>
+Joe Thornber <joe.thornber@gmail.com>
+Jon Dyte <jon@totient.co.uk>
+Kamil Shakirov <kamils80@gmail.com>
+Martin Hurton <hurtonm@gmail.com>
+Martin Lucina <mato@kotelna.sk>
+Martin Sustrik <sustrik@250bpm.com>
+Matus Hamorsky <mhamorsky@gmail.com>
+McClain Looney <m@loonsoft.com>
+Pavel Gushcha <pavimus@gmail.com>
+Pavol Malosek <malosek@fastmq.com>
+Steven McCoy <steven.mccoy@miru.hk>
+Tamara Kustarova <kustarova.tamara@gmail.com>
+Tero Marttila <terom@fixme.fi>
+Terry Wilson <terry@logivox.net>
+Vitaly Mayatskikh <v.mayatskih@gmail.com>
 
 Credits
 =======
 
-Aamir Mohammad
-Aleksey Yeschenko
-Alexander Majorov
-Bernd Schumacher
-Brett Cameron
-Brian Granger
-Carsten Dinkelmann
-David Bahi
-Dirk Eddelbuettel
-Evgueny Khartchenko
-Frank Vanden Berghen
-John Apps
-Markus Fischer
-Matt Muggeridge
-Paulo Henrique Silva
-Peter Busser
-Peter Lemenkov
-Robert Zhang
+Aamir Mohammad <aamirjvm@gmail.com>
+Adrian von Bidder <avbidder@fortytwo.ch>
+Aleksey Yeschenko <aleksey@yeschenko.com>
+Alessio Spadaro <alessio.spadaro@finservice.com>
+Alexander Majorov <alexander.majorov@intel.com>
+Bernd Schumacher <bernd.schumacher@hp.com>
+Brett Cameron <Brett.Cameron@hp.com>
+Brian Granger <ellisonbg.net@gmail.com>
+Carsten Dinkelmann <din@foobar-cpa.de>
+David Bahi <dbahi@novell.com>
+Dirk Eddelbuettel <edd@debian.org>
+Evgueny Khartchenko <Evgueny.Khartchenko@intel.com>
+Frank Vanden Berghen <frank@applied-mathematics.net>
+John Apps <john.apps@hp.com>
+Markus Fischer <markus.fischer@hpc-solutions.com>
+Matt Muggeridge <Matt.Muggeridge@hp.com>
+Michael Santy <Michael.Santy@dynetics.com>
+Paulo Henrique Silva <ph.silva@gmail.com>
+Peter Busser <busserpeter@gmail.com>
+Peter Lemenkov <lemenkov@gmail.com>
+Robert Zhang <robert@scout-trading.com>
+Toralf Wittner <toralf.wittner@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 82da294..0560e75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,8 +28,8 @@ Distribution
 Building
 --------
 
-* Many portability fixes, including support for new platforms: NetBSD,
-  HP-UX, Cygwin.
+* Many portability fixes, including support for new platforms: FreeBSD, 
+  NetBSD, HP-UX and Cygwin.
 
 * Invocation of configure has been simplified, all functionality is now
   built by default with the exception of OpenPGM.
@@ -95,23 +95,28 @@ including:
 
 * Adrian von Bidder <avbidder@fortytwo.ch>, for contributing Debian packages.
 
+* Aleksey Yeschenko <aleksey@yeschenko.com>, for contributing a Lua binding.
+
+* Alessio Spadaro <alessio.spadaro@finservice.com>, for help with porting to
+  HP-UX.
+
+* Bernd Prager <bernd@prager.ws>, for help with porting to Cygwin.
+
 * Brian E. Granger <ellisonbg@gmail.com>, for maintaining the Python binding.
 
 * Martin Hurton <hurtonm@gmail.com>, for implementing flow control.
 
-* Martin Lucina <mato@kotelna.sk> for rewriting the 0MQ reference manual and
+* Martin Lucina <mato@kotelna.sk>, for rewriting the 0MQ reference manual and
   many portability fixes.
 
-* Steven McCoy <steven@miru.hk>, for help with OpenPGM.
-
 * Michael Santy <Michael.Santy@dynetics.com>, for testing this release with
   Infiniband.
 
+* Steven McCoy <steven@miru.hk>, for help with OpenPGM.
+
 * Toralf Wittner <toralf.wittner@gmail.com>, for contributing a Haskell
   binding.
 
-* Aleksey Yeschenko <aleksey@yeschenko.com>, for contributing a Lua binding.
-
 -------------------------------------------------------------------------------
 A full list of all changes since the release of 0MQ 2.0 beta2 follows:
 
-- 
cgit v1.2.3