Browse code

Update .mailmap and AUTHORS

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)

Tianon Gravi authored on 2014/02/05 05:18:12
Showing 2 changed files
... ...
@@ -49,7 +49,7 @@ Jean-Baptiste Dalido <jeanbaptiste@appgratis.com>
49 49
 <michael@crosbymichael.com> <crosby.michael@gmail.com>
50 50
 <github@metaliveblog.com> <github@developersupport.net>
51 51
 <brandon@ifup.org> <brandon@ifup.co>
52
-<dnordberg@gmail.com> <dano@spotify.com>
52
+<dano@spotify.com> <daniel.norberg@gmail.com>
53 53
 <danny@codeaholics.org> <Danny.Yates@mailonline.co.uk>
54 54
 <gurjeet@singh.im> <singh.gurjeet@gmail.com>
55 55
 <shawn@churchofgit.com> <shawnlandden@gmail.com>
... ...
@@ -57,3 +57,4 @@ Jean-Baptiste Dalido <jeanbaptiste@appgratis.com>
57 57
 <solomon@dotcloud.com> <solomon.hykes@dotcloud.com>
58 58
 <SvenDowideit@home.org.au> <SvenDowideit@fosiki.com>
59 59
 Sven Dowideit <SvenDowideit@home.org.au> ¨Sven <¨SvenDowideit@home.org.au¨>
60
+unclejack <unclejacksons@gmail.com> <unclejack@users.noreply.github.com>
... ...
@@ -4,6 +4,8 @@
4 4
 # For a list of active project maintainers, see the MAINTAINERS file.
5 5
 #
6 6
 Aanand Prasad <aanand.prasad@gmail.com>
7
+Aaron Feng <aaron.feng@gmail.com>
8
+Abel Muiño <amuino@gmail.com>
7 9
 Alexander Larsson <alexl@redhat.com>
8 10
 Alexey Shamrin <shamrin@gmail.com>
9 11
 Alex Gaynor <alex.gaynor@gmail.com>
... ...
@@ -26,6 +28,7 @@ Antony Messerli <amesserl@rackspace.com>
26 26
 apocas <petermdias@gmail.com>
27 27
 Asbjørn Enge <asbjorn@hanafjedle.net>
28 28
 Barry Allard <barry.allard@gmail.com>
29
+Bartłomiej Piotrowski <b@bpiotrowski.pl>
29 30
 Benoit Chesneau <bchesneau@gmail.com>
30 31
 Ben Sargent <ben@brokendigits.com>
31 32
 Ben Toews <mastahyeti@gmail.com>
... ...
@@ -45,6 +48,9 @@ Caleb Spare <cespare@gmail.com>
45 45
 Calen Pennington <cale@edx.org>
46 46
 Carl X. Su <bcbcarl@gmail.com>
47 47
 Charles Hooper <charles.hooper@dotcloud.com>
48
+Charles Lindsay <chaz@chazomatic.us>
49
+Chia-liang Kao <clkao@clkao.org>
50
+Chris St. Pierre <chris.a.st.pierre@gmail.com>
48 51
 Christopher Currie <codemonkey+github@gmail.com>
49 52
 Christopher Rigor <crigor@gmail.com>
50 53
 Christophe Troestler <christophe.Troestler@umons.ac.be>
... ...
@@ -59,8 +65,7 @@ Daniel Exner <dex@dragonslave.de>
59 59
 Daniel Garcia <daniel@danielgarcia.info>
60 60
 Daniel Gasienica <daniel@gasienica.ch>
61 61
 Daniel Mizyrycki <daniel.mizyrycki@dotcloud.com>
62
-Daniel Norberg <daniel.norberg@gmail.com>
63
-Daniel Norberg <dnordberg@gmail.com>
62
+Daniel Norberg <dano@spotify.com>
64 63
 Daniel Nordberg <dnordberg@gmail.com>
65 64
 Daniel Robinson <gottagetmac@gmail.com>
66 65
 Daniel Von Fange <daniel@leancoder.com>
... ...
@@ -110,6 +115,7 @@ Gabe Rosenhouse <gabe@missionst.com>
110 110
 Gabriel Monroy <gabriel@opdemand.com>
111 111
 Galen Sampson <galen.sampson@gmail.com>
112 112
 Gareth Rushgrove <gareth@morethanseven.net>
113
+Gereon Frey <gereon.frey@dynport.de>
113 114
 Gert van Valkenhoef <g.h.m.van.valkenhoef@rug.nl>
114 115
 Graydon Hoare <graydon@pobox.com>
115 116
 Greg Thornton <xdissent@me.com>
... ...
@@ -123,8 +129,10 @@ Hunter Blanks <hunter@twilio.com>
123 123
 inglesp <peter.inglesby@gmail.com>
124 124
 Isaac Dupree <antispam@idupree.com>
125 125
 Isao Jonas <isao.jonas@gmail.com>
126
+Jake Moshenko <jake@devtable.com>
126 127
 James Allen <jamesallen0108@gmail.com>
127 128
 James Carr <james.r.carr@gmail.com>
129
+James Mills <prologic@shortcircuit.net.au>
128 130
 James Turnbull <james@lovedthanlost.net>
129 131
 jaseg <jaseg@jaseg.net>
130 132
 Jason McVetta <jason.mcvetta@gmail.com>
... ...
@@ -144,6 +152,7 @@ Johannes 'fish' Ziemke <github@freigeist.org>
144 144
 Johan Rydberg <johan.rydberg@gmail.com>
145 145
 John Costa <john.costa@gmail.com>
146 146
 John Feminella <jxf@jxf.me>
147
+John Gardiner Myers <jgmyers@proofpoint.com>
147 148
 John Warwick <jwarwick@gmail.com>
148 149
 Jonas Pfenniger <jonas@pfenniger.name>
149 150
 Jonathan Mueller <j.mueller@apoveda.ch>
... ...
@@ -168,7 +177,9 @@ Keli Hu <dev@keli.hu>
168 168
 Ken Cochrane <kencochrane@gmail.com>
169 169
 Kevin Clark <kevin.clark@gmail.com>
170 170
 Kevin J. Lynagh <kevin@keminglabs.com>
171
+Keyvan Fatehi <keyvanfatehi@gmail.com>
171 172
 kim0 <email.ahmedkamal@googlemail.com>
173
+Kim BKC Carlbacker <kim.carlbacker@gmail.com>
172 174
 Kimbro Staken <kstaken@kstaken.com>
173 175
 Kiran Gangadharan <kiran.daredevil@gmail.com>
174 176
 Konstantin Pelykh <kpelykh@zettaset.com>
... ...
@@ -197,6 +208,8 @@ Matt Apperson <me@mattapperson.com>
197 197
 Matt Bachmann <bachmann.matt@gmail.com>
198 198
 Matt Haggard <haggardii@gmail.com>
199 199
 Matthew Mueller <mattmuelle@gmail.com>
200
+mattymo <raytrac3r@gmail.com>
201
+Maxime Petazzoni <max@signalfuse.com>
200 202
 Maxim Treskin <zerthurd@gmail.com>
201 203
 meejah <meejah@meejah.ca>
202 204
 Michael Crosby <michael@crosbymichael.com>
... ...
@@ -204,6 +217,7 @@ Michael Gorsuch <gorsuch@github.com>
204 204
 Michael Stapelberg <michael+gh@stapelberg.de>
205 205
 Miguel Angel Fernández <elmendalerenda@gmail.com>
206 206
 Mike Gaffney <mike@uberu.com>
207
+Mike Naberezny <mike@naberezny.com>
207 208
 Mikhail Sobolev <mss@mawhrin.net>
208 209
 Mohit Soni <mosoni@ebay.com>
209 210
 Morten Siebuhr <sbhr@sbhr.dk>
... ...
@@ -221,6 +235,7 @@ Nolan Darilek <nolan@thewordnerd.info>
221 221
 odk- <github@odkurzacz.org>
222 222
 Oguz Bilgic <fisyonet@gmail.com>
223 223
 Ole Reifschneider <mail@ole-reifschneider.de>
224
+O.S.Tezer <ostezer@gmail.com>
224 225
 pandrew <letters@paulnotcom.se>
225 226
 Pascal Borreli <pascal@borreli.com>
226 227
 pattichen <craftsbear@gmail.com>
... ...
@@ -231,12 +246,14 @@ Paul Morie <pmorie@gmail.com>
231 231
 Paul Nasrat <pnasrat@gmail.com>
232 232
 Paul <paul9869@gmail.com>
233 233
 Peter Braden <peterbraden@peterbraden.co.uk>
234
-Peter Waller <p@pwaller.net>
234
+Peter Waller <peter@scraperwiki.com>
235 235
 Phil Spitler <pspitler@gmail.com>
236
+Piergiuliano Bossi <pgbossi@gmail.com>
236 237
 Pierre-Alain RIVIERE <pariviere@ippon.fr>
237 238
 Piotr Bogdan <ppbogdan@gmail.com>
238 239
 pysqz <randomq@126.com>
239 240
 Quentin Brossard <qbrossard@gmail.com>
241
+Rafal Jeczalik <rjeczalik@gmail.com>
240 242
 Ramkumar Ramachandra <artagnon@gmail.com>
241 243
 Ramon van Alteren <ramon@vanalteren.nl>
242 244
 Renato Riccieri Santos Zannon <renato.riccieri@gmail.com>
... ...
@@ -245,6 +262,7 @@ Rhys Hiltner <rhys@twitch.tv>
245 245
 Richo Healey <richo@psych0tik.net>
246 246
 Rick Bradley <rick@users.noreply.github.com>
247 247
 Robert Obryk <robryk@gmail.com>
248
+Roberto G. Hashioka <roberto.hashioka@docker.com>
248 249
 Roberto Hashioka <roberto_hashioka@hotmail.com>
249 250
 Rodrigo Vaz <rodrigo.vaz@gmail.com>
250 251
 Roel Van Nyen <roel.vannyen@gmail.com>
... ...
@@ -254,6 +272,7 @@ Ryan O'Donnell <odonnellryanc@gmail.com>
254 254
 Ryan Seto <ryanseto@yak.net>
255 255
 Sam Alba <sam.alba@gmail.com>
256 256
 Sam J Sharpe <sam.sharpe@digital.cabinet-office.gov.uk>
257
+Samuel Andaya <samuel@andaya.net>
257 258
 Scott Bessler <scottbessler@gmail.com>
258 259
 Sean Cronin <seancron@gmail.com>
259 260
 Sean P. Kane <skane@newrelic.com>
... ...
@@ -262,6 +281,7 @@ Shawn Siefkas <shawn.siefkas@meredith.com>
262 262
 Shih-Yuan Lee <fourdollars@gmail.com>
263 263
 shin- <joffrey@docker.com>
264 264
 Silas Sewell <silas@sewell.org>
265
+Simon Taranto <simon.taranto@gmail.com>
265 266
 Sjoerd Langkemper <sjoerd-github@linuxonly.nl>
266 267
 Solomon Hykes <solomon@dotcloud.com>
267 268
 Song Gao <song@gao.io>
... ...
@@ -270,7 +290,7 @@ Sridhar Ratnakumar <sridharr@activestate.com>
270 270
 Steeve Morin <steeve.morin@gmail.com>
271 271
 Stefan Praszalowicz <stefan@greplin.com>
272 272
 sudosurootdev <sudosurootdev@gmail.com>
273
-Sven Dowideit <SvenDowideit@home.org.au>
273
+Sven Dowideit <svendowideit@home.org.au>
274 274
 Sylvain Bellemare <sylvain.bellemare@ezeep.com>
275 275
 tang0th <tang0th@gmx.com>
276 276
 Tatsuki Sugiura <sugi@nemui.org>
... ...
@@ -296,6 +316,7 @@ Tyler Brock <tyler.brock@gmail.com>
296 296
 Tzu-Jung Lee <roylee17@gmail.com>
297 297
 Ulysse Carion <ulyssecarion@gmail.com>
298 298
 unclejack <unclejacksons@gmail.com>
299
+vgeta <gopikannan.venugopalsamy@gmail.com>
299 300
 Victor Coisne <victor.coisne@dotcloud.com>
300 301
 Victor Lyuboslavsky <victor@victoreda.com>
301 302
 Victor Vieux <victor.vieux@docker.com>