summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorMartin Lucina <mato@kotelna.sk>2010-06-01 21:49:50 +0200
committerMartin Lucina <mato@kotelna.sk>2010-06-01 21:49:50 +0200
commit74a03dfd7dbb762be5d50eca4df214f8825ad44a (patch)
tree5d2a90854a4e569ef81f1da758c9e483b62828e5 /AUTHORS
parent99e6179edd9e3552fcdb7f4fce3306cd174f3359 (diff)
parent8a771350795dc4f9aae6a89534f1391d7b63b10c (diff)
Merge branch 'master' of github.com:sustrik/zeromq2
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 1 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index b14a545..79f100a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,6 +24,7 @@ Matus Hamorsky <mhamorsky@gmail.com>
McClain Looney <m@loonsoft.com>
Pavel Gushcha <pavimus@gmail.com>
Pavol Malosek <malosek@fastmq.com>
+Pieter Hintjens <ph@imatix.com>
Steven McCoy <steven.mccoy@miru.hk>
Tamara Kustarova <kustarova.tamara@gmail.com>
Tero Marttila <terom@fixme.fi>
@@ -53,6 +54,5 @@ Michael Santy <Michael.Santy@dynetics.com>
Paulo Henrique Silva <ph.silva@gmail.com>
Peter Busser <busserpeter@gmail.com>
Peter Lemenkov <lemenkov@gmail.com>
-Pieter Hintjens <ph@imatix.com>
Robert Zhang <robert@scout-trading.com>
Toralf Wittner <toralf.wittner@gmail.com>