diff options
author | Martin Lucina <mato@kotelna.sk> | 2010-06-01 21:49:50 +0200 |
---|---|---|
committer | Martin Lucina <mato@kotelna.sk> | 2010-06-01 21:49:50 +0200 |
commit | 74a03dfd7dbb762be5d50eca4df214f8825ad44a (patch) | |
tree | 5d2a90854a4e569ef81f1da758c9e483b62828e5 /AUTHORS | |
parent | 99e6179edd9e3552fcdb7f4fce3306cd174f3359 (diff) | |
parent | 8a771350795dc4f9aae6a89534f1391d7b63b10c (diff) |
Merge branch 'master' of github.com:sustrik/zeromq2
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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> |