From: Loic Dachary <loic@dachary.org>
Date: Mon, 4 Aug 2014 06:52:03 +0000 (+0200)
Subject: mailmap: sort entries
X-Git-Tag: v0.85~88^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2165%2Fhead;p=ceph.git

mailmap: sort entries

to help avoid duplicates (found one)

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/.mailmap b/.mailmap
index 3bbbc274ddc5..3882df2e7fb1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,149 +1,149 @@
 #
 # See .organizationmap for organization affiliation
 #
-Sage Weil <sage@inktank.com> <sage@newdream.net>
-Sage Weil <sage@inktank.com> <sage.weil@dreamhost.com>
-Sage Weil <sage@inktank.com> <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
-Sage Weil <sage@inktank.com> <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
-Sage Weil <sage@inktank.com> <sage@ceph0.dreamhost.com>
-Sage Weil <sage@inktank.com> <sage@skinny.ops.newdream.net>
-Sage Weil <sage@inktank.com> <sage@foil.westwood.newdream.net>
-Sage Weil <sage@inktank.com> <sage@vapre.localdomain>
-Sage Weil <sage@inktank.com> <sage.weil@inktank.com>
-Sage Weil <sage@inktank.com> <sage@inkank.com>
-Sage Weil <sage@inktank.com> <sage@Inktank.com>
-Sage Weil <sweil@redhat.com> Sage Weil <sage@redhat.com>
-Yehuda Sadeh <yehuda@inktank.com> <yehuda@hq.newdream.net>
-Yehuda Sadeh <yehuda@inktank.com> <yehuda.sadeh@dreamhost.com>
-Yehuda Sadeh <yehuda@inktank.com> <yehuda@yehuda.infit.com>
-Yehuda Sadeh <yehuda@inktank.com> <yehuda@yehuda>
-Yehuda Sadeh <yehuda@inktank.com> <yehudasa@fatty.ops.newdream.net>
-Yehuda Sadeh <yehuda@inktank.com> <yehudasa@gmail.com>
-Yehuda Sadeh <yehuda@inktank.com> <yehudasa@ceph0.dreamhost.com>
-Yehuda Sadeh <yehuda@inktank.com> <yehdua@inktank.com>
-Yehuda Sadeh <yehuda@inktank.com> <yehuda.sadeh@inktank.com>
+Ailing Zhang <zhangal1992@gmail.com> <ailzhang@users.noreply.github.com>
+Alexandre Marangone <alexandre.marangone@inktank.com> Alexandre Maragone <alexandre.marangone@inktank.com>
+Alexandre Marangone <alexandre.marangone@inktank.com> <a.marangone@gmail.com>
+Alexandre Oliva <oliva@gnu.org> <lxoliva@fsfla.org>
+Alexandre Oliva <oliva@gnu.org> <oliva@lsd.ic.unicamp.br>
+Alex Elder <elder@inktank.com> <elder@doink.(none)>
+Alex Elder <elder@inktank.com> <elder@dreamhost.com>
+Alex Elder <elder@inktank.com> <elder@speedy.(none)>
+Alfredo Deza <alfredo.deza@inktank.com> <alfredo@deza.pe>
+Andrew Leung <aleung@cs.ucsc.edu> anwleung <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
+Aristoteles Neto <aristoteles.neto@webdrive.co.nz>  <wdneto@users.noreply.github.com>
+Brian Rak <dn@devicenull.org> devicenull <dn@devicenull.org>
+Caleb Miles <caleb.miles@inktank.com> caleb miles <caleb.miles@inktank.com>
+Caleb Miles <caleb.miles@inktank.com> caleb miles <caselim@gmail.com>
+Caleb Miles <caleb.miles@inktank.com> Caleb Miles <caselim@gmail.com>
+Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
+Christian Brunner <christian@brunner-muc.de> <chb@muc.de> 
+Christian Marie <pingu@anchor.net.au> <christian@ponies.io>
+Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gmail.com>
 Colin P. McCabe <colinm@hq.newdream.net> <cmccabe@alumni.cmu.edu>
 Colin P. McCabe <colinm@hq.newdream.net> <cmccabe@fatty.ops.newdream.net>
-Greg Farnum <greg@inktank.com> <gregf@hq.newdream.net>
-Greg Farnum <greg@inktank.com> <gregory.farnum@dreamhost.com>
-Greg Farnum <greg@inktank.com> Gregory Farnum <greg@inktank.com> 
-Greg Farnum <greg@inktank.com> <greg@gregs42.com>
-Greg Farnum <greg@inktank.com> <gregf@skinny.ops.newdream.net>
+Dan Chai <tengweicai@gmail.com> danchai <tengweicai@gmail.com>
+Dan Mick <dan.mick@inktank.com> <dan.mick@dreamhost.com>
+Dan Mick <dan.mick@inktank.com> <dan.mick@intank.com>
+Dan Mick <dan.mick@inktank.com> <dmick@danceorelse.org>
+Danny Al-Gaaf <danny.al-gaaf@bisect.de> <danny.kukawka@bisect.de>
+David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
+Dmitry Smirnov <onlyjob@member.fsf.org> <onlyjob@debian.org>
+Dominik Hannen <cantares1+github@gmail.com> Dominik Hannen <dhxgit@users.noreply.github.com>
+Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
+Erwin, Brock A <Brock.Erwin@pnl.gov> <Brock.Erwin@pnl.govgit>
+Esteban Molina-Estolano <eestolan@lanl.gov> eestolan <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
+Florent Bautista <florent@coppint.com> FlorentCoppint <florent@coppint.com>
+Florent Flament <florent.flament@cloudwatt.com> <florent.flament-ext@cloudwatt.com>
+Gary Lowell <gary.lowell@inktank.com> Gary Lowelll <gary.lowell@inktank.com>
+Gary Lowell <gary.lowell@inktank.com> <glowell@flab.ops.newdream.net>
+Gary Lowell <gary.lowell@inktank.com> <glowell@inktank.com>
 Greg Farnum <greg@inktank.com> <gfarnum@GF-Macbook.local>
 Greg Farnum <greg@inktank.com> Greg Farnu <greg@inktank.com>
 Greg Farnum <greg@inktank.com> <greg.farnum@dreamhost.com>
-Samuel Just <sam.just@inktank.com> <samuel.just@dreamhost.com>
-Samuel Just <sam.just@inktank.com> <rexludorum@gmail.com>
-Samuel Just <sam.just@inktank.com> <samuelj@hq.newdream.net>
-Samuel Just <sam.just@inktank.com> <sam.just@dreamhost.com>
-Samuel Just <sam.just@inktank.com> <sam@Pondermatic.(none)>
-Samuel Just <sam.just@inktank.com> Sam Just <sam.just@inktank.com>
-Samuel Just <sam.just@inktank.com> athanatos <sam.just@inktank.com>
-Samuel Just <sam.just@inktank.com> <samuel.just@inktank.com>
-John Wilkins <john.wilkins@inktank.com> <john.wilkins@dreamhost.com>
-John Wilkins <john.wilkins@inktank.com> <john@admin-host.(none)>
-John Wilkins <john.wilkins@inktank.com> <johnw@johnw7664.(none)>
-Josh Durgin <josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
-Josh Durgin <josh.durgin@inktank.com> <joshd@hq.newdream.net>
-Dan Mick <dan.mick@inktank.com> <dan.mick@dreamhost.com>
-Dan Mick <dan.mick@inktank.com> <dmick@danceorelse.org>
-Dan Mick <dan.mick@inktank.com> <dan.mick@intank.com>
-Tommi Virtanen <tv@inktank.com> <tommi.virtanen@dreamhost.com>
-Tommi Virtanen <tv@inktank.com> <tv@hq.newdream.net>
-Tommi Virtanen <tv@inktank.com> <tv@eagain.net>
+Greg Farnum <greg@inktank.com> <gregf@hq.newdream.net>
+Greg Farnum <greg@inktank.com> <gregf@skinny.ops.newdream.net>
+Greg Farnum <greg@inktank.com> <greg@gregs42.com>
+Greg Farnum <greg@inktank.com> <gregory.farnum@dreamhost.com>
+Greg Farnum <greg@inktank.com> Gregory Farnum <greg@inktank.com> 
+Guang Yang <yguang@yahoo-inc.com> Guang Yang <yguang@caughtrealize-dl-vm0.peking.corp.yahoo.com>
+Guang Yang <yguang@yahoo-inc.com> <guangyy@gmail.com>
+Guilhem Lettron <guilhem@lettron.fr> <guilhem+github@lettron.fr>
+Henry C Chang <henry_c_chang@tcloudcomputing.com> <henry.cy.chang@gmail.com>
+Holger Macht <hmacht@suse.de> <holger@homac.de>
+Huang Jun <hjwsm1989@gmail.com> huang jun <hjwsm1989@gmail.com>
+Huang Jun <hjwsm1989@gmail.com> huangjun <hjwsm1989@gmail.com>
+Ilya Dryomov <ilya.dryomov@inktank.com> <idryomov@gmail.com>
 João Eduardo Luís <joao.luis@inktank.com> <jecluis@gmail.com>
 João Eduardo Luís <joao.luis@inktank.com> Joao Eduardo Luis <joao.luis@inktank.com>
-João Eduardo Luís <joao.luis@inktank.com> Joao Luis <joao.luis@inktank.com>
 João Eduardo Luís <joao.luis@inktank.com> <joao@inktank.com>
+João Eduardo Luís <joao.luis@inktank.com> Joao Luis <joao.luis@inktank.com>
 João Eduardo Luís <joao@redhat.com> <jluis@redhat.com>
-Sandon Van Ness <sandon@inktank.com> SandonV <sandon@inktank.com>
-Sam Lang <sam.lang@inktank.com> <samlang@gmail.com>
-Noah Watkins <noah.watkins@inktank.com> <noahwatkins@gmail.com>
-Noah Watkins <noah.watkins@inktank.com> <jayhawk@cs.ucsc.edu>
-Gary Lowell <gary.lowell@inktank.com> <glowell@flab.ops.newdream.net>
-Gary Lowell <gary.lowell@inktank.com> <glowell@inktank.com>
-Gary Lowell <gary.lowell@inktank.com> Gary Lowelll <gary.lowell@inktank.com>
-Patience Warnick <patience@cranium.pelton.net> <patiencew@29311d96-e01e-0410-9327-a35deaab8ce9>
-Wido den Hollander <wido@42on.com> <wido@widodh.nl>
-Michael Rodriguez <michael@newdream.net> <michael@squid.newdream.net>
-Michael Rodriguez <michael@newdream.net> <michael@newdream.net>
-Caleb Miles <caleb.miles@inktank.com> caleb miles <caselim@gmail.com>
-Caleb Miles <caleb.miles@inktank.com> caleb miles <caleb.miles@inktank.com>
-Caleb Miles <caleb.miles@inktank.com> Caleb Miles <caselim@gmail.com>
 Joe Buck <jbbuck@gmail.com> <buck@soe.ucsc.edu>
+John Spray <jspray@redhat.com> <john.spray@redhat.com>
+John Wilkins <john.wilkins@inktank.com> <john@admin-host.(none)>
+John Wilkins <john.wilkins@inktank.com> <john.wilkins@dreamhost.com>
+John Wilkins <john.wilkins@inktank.com> <johnw@johnw7664.(none)>
+Josh Durgin <josh.durgin@inktank.com> <joshd@hq.newdream.net>
+Josh Durgin <josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
+Kacper Kowalik <xarthisius@gentoo.org> Kacper Kowalik (Xarthisius) <xarthisius@gentoo.org> 
 Laszlo Boszormenyi <gcs@debian.hu> Laszlo Boszormenyi (GCS) <gcs@debian.hu>
+Lluis Pamies-Juarez <lluis.pamies-juarez@hgst.com> <lluis@pamies.cat>
+Loic Dachary <loic@dachary.org> <loic@dachary.com>
+Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
+Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
+Ma Jianpeng <jianpeng.ma@intel.com> Ma, Jianpeng <jianpeng.ma@intel.com>
+Mark Nelson <mark.nelson@inktank.com> <mark.a.nelson@gmail.com>
+Matthew Roy <matthew@royhousehold.net> <matthew@matthew-ubuntu.(none)>
+Matthew Roy <matthew@royhousehold.net> <mroy@sandbox-ed.com>
+Matthew Wodrich <matthew.wodrich@dreamhost.com> <mattheww@Mattsbox.(none)>
+Michael Riederer <michael@riederer.org> dynamike67 <michael@riederer.org>
+Michael Rodriguez <michael@newdream.net> <michael@newdream.net>
+Michael Rodriguez <michael@newdream.net> <michael@squid.newdream.net>
+Neil Levine <neil.levine@inktank.com> <levine@yoyo.org>
+Noah Watkins <noah.watkins@inktank.com> <jayhawk@cs.ucsc.edu>
+Noah Watkins <noah.watkins@inktank.com> <noahwatkins@gmail.com>
+Pascal de Bruijn <pascal@unilogicnetworks.net> Pascal de Bruijn | Unilogic Networks B.V <pascal@unilogicnetworks.net>
+Patience Warnick <patience@cranium.pelton.net> <patiencew@29311d96-e01e-0410-9327-a35deaab8ce9>
+Patrick McGarry <patrick@inktank.com> <pmcgarry@gmail.com>
+Patrick McGarry <patrick@inktank.com> scuttlemonkey <patrick@inktank.com>
 Roald J. van Loon <roald@roaldvanloon.nl> <roaldvanloon@gmail.com>
-Alex Elder <elder@inktank.com> <elder@dreamhost.com>
-Alex Elder <elder@inktank.com> <elder@doink.(none)>
-Alex Elder <elder@inktank.com> <elder@speedy.(none)>
-Alexandre Marangone <alexandre.marangone@inktank.com> <a.marangone@gmail.com>
-Alexandre Marangone <alexandre.marangone@inktank.com> Alexandre Maragone <alexandre.marangone@inktank.com>
-Alexandre Oliva <oliva@gnu.org> <oliva@lsd.ic.unicamp.br>
-Alexandre Oliva <oliva@gnu.org> <lxoliva@fsfla.org>
+Ron Allred <rallred@itrefined.com> rallred <ron-github@neversleep.net>
 Ross Turk <ross.turk@inktank.com> <ross@inktank.com> 
 Ross Turk <ross.turk@inktank.com> <ross.turk@dreamhost.com>
-Patrick McGarry <patrick@inktank.com> <pmcgarry@gmail.com>
-Patrick McGarry <patrick@inktank.com> scuttlemonkey <patrick@inktank.com>
-Mark Nelson <mark.nelson@inktank.com> <mark.a.nelson@gmail.com>
-Tamil Muthamizhan <tamil.muthamizhan@inktank.com> <tamil@ubuntu.(none)>
+Sage Weil <sage@inktank.com> <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
+Sage Weil <sage@inktank.com> <sage@ceph0.dreamhost.com>
+Sage Weil <sage@inktank.com> <sage@foil.westwood.newdream.net>
+Sage Weil <sage@inktank.com> <sage@inkank.com>
+Sage Weil <sage@inktank.com> <sage@Inktank.com>
+Sage Weil <sage@inktank.com> <sage@newdream.net>
+Sage Weil <sage@inktank.com> <sage@skinny.ops.newdream.net>
+Sage Weil <sage@inktank.com> <sage@vapre.localdomain>
+Sage Weil <sage@inktank.com> <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
+Sage Weil <sage@inktank.com> <sage.weil@dreamhost.com>
+Sage Weil <sage@inktank.com> <sage.weil@inktank.com>
+Sage Weil <sweil@redhat.com> Sage Weil <sage@redhat.com>
+Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com> <sahid.ferdjaoui@gmail.com>
+Sam Lang <sam.lang@inktank.com> <samlang@gmail.com>
+Samuel Just <sam.just@inktank.com> athanatos <sam.just@inktank.com>
+Samuel Just <sam.just@inktank.com> <rexludorum@gmail.com>
+Samuel Just <sam.just@inktank.com> <sam.just@dreamhost.com>
+Samuel Just <sam.just@inktank.com> Sam Just <sam.just@inktank.com>
+Samuel Just <sam.just@inktank.com> <sam@Pondermatic.(none)>
+Samuel Just <sam.just@inktank.com> <samuelj@hq.newdream.net>
+Samuel Just <sam.just@inktank.com> <samuel.just@dreamhost.com>
+Samuel Just <sam.just@inktank.com> <samuel.just@inktank.com>
+Sandon Van Ness <sandon@inktank.com> SandonV <sandon@inktank.com>
+Sebastien Han <sebastien.han@enovance.com> <sebastien.han@enovance.com>
+Sebastien Ponce <sebastien.ponce@cern.ch> Sebastien Ponce <Sebastien.Ponce@cern.ch>
+Stephen F Taylor <steveftaylor@gmail.com> <steve@DES-U1404-STETAY.stc.local>
+Sushma Gurram <sushma.gurram@sandisk.com> sushma <sushma.gurram@sandisk.com>
+Sylvain Munaut <s.munaut@whatever-company.com> <tnt@246tNt.com>
 Tamil Muthamizhan <tamil.muthamizhan@inktank.com> tamil <tamil.muthamizhan@inktank.com>
 Tamil Muthamizhan <tamil.muthamizhan@inktank.com> <tamil@tamil-VirtualBox.(none)>
+Tamil Muthamizhan <tamil.muthamizhan@inktank.com> <tamil@ubuntu.(none)>
 Thomas Bechtold <t.bechtold@telekom.de> <thomasbechtold@jpberlin.de>
-Christian Brunner <christian@brunner-muc.de> <chb@muc.de> 
-Henry C Chang <henry_c_chang@tcloudcomputing.com> <henry.cy.chang@gmail.com>
-Alfredo Deza <alfredo.deza@inktank.com> <alfredo@deza.pe>
-Sylvain Munaut <s.munaut@whatever-company.com> <tnt@246tNt.com>
-Erwin, Brock A <Brock.Erwin@pnl.gov> <Brock.Erwin@pnl.govgit>
-Kacper Kowalik <xarthisius@gentoo.org> Kacper Kowalik (Xarthisius) <xarthisius@gentoo.org> 
-Neil Levine <neil.levine@inktank.com> <levine@yoyo.org>
-Guilhem Lettron <guilhem@lettron.fr> <guilhem+github@lettron.fr>
-Holger Macht <hmacht@suse.de> <holger@homac.de>
-Volker Assmann <volker@twisted-nerve.de> <volker@stan.local>
+Tommi Virtanen <tv@inktank.com> <tommi.virtanen@dreamhost.com>
+Tommi Virtanen <tv@inktank.com> <tv@eagain.net>
+Tommi Virtanen <tv@inktank.com> <tv@hq.newdream.net>
+Tyler Brekke <tyler.brekke@inktank.com> Concubidated <tyler.brekke@inktank.com>
 Volker Assmann <volker@twisted-nerve.de> <volker@36-135.mops.RWTH-Aachen.DE>
-Sebastien Han <sebastien.han@enovance.com> <sebastien.han@enovance.com>
-Matthew Roy <matthew@royhousehold.net> <matthew@matthew-ubuntu.(none)>
-Matthew Roy <matthew@royhousehold.net> <mroy@sandbox-ed.com>
-Matthew Wodrich <matthew.wodrich@dreamhost.com> <mattheww@Mattsbox.(none)>
-Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gmail.com>
-Loic Dachary <loic@dachary.org> <loic@dachary.com>
-Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
-Yan, Zheng <zheng.z.yan@intel.com> Zheng, Yan <zheng.z.yan@intel.com>
-Yan, Zheng <zheng.z.yan@intel.com> Zheng Yan <zheng.z.yan@intel.com>
-Yan, Zheng <zheng.z.yan@intel.com> <ukernel@gmail.com>
+Volker Assmann <volker@twisted-nerve.de> <volker@stan.local>
+Walter Huf <hufman@gmail.com> Walter J. Huf <hufman@gmail.com>
 Wang, Yaguang <yaguang.wang@intel.com> ywang19 <yaguang.wang@intel.com>
-David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
-Andrew Leung <aleung@cs.ucsc.edu> anwleung <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
-Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
-Esteban Molina-Estolano <eestolan@lanl.gov> eestolan <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
-Pascal de Bruijn <pascal@unilogicnetworks.net> Pascal de Bruijn | Unilogic Networks B.V <pascal@unilogicnetworks.net>
-Huang Jun <hjwsm1989@gmail.com> huangjun <hjwsm1989@gmail.com>
-Ron Allred <rallred@itrefined.com> rallred <ron-github@neversleep.net>
-Dan Chai <tengweicai@gmail.com> danchai <tengweicai@gmail.com>
-Christian Marie <pingu@anchor.net.au> <christian@ponies.io>
-Ma Jianpeng <jianpeng.ma@intel.com> Ma, Jianpeng <jianpeng.ma@intel.com>
-Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
-Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
-Danny Al-Gaaf <danny.al-gaaf@bisect.de> <danny.kukawka@bisect.de>
-Guang Yang <yguang@yahoo-inc.com> <guangyy@gmail.com>
-Guang Yang <yguang@yahoo-inc.com> Guang Yang <yguang@caughtrealize-dl-vm0.peking.corp.yahoo.com>
-Tyler Brekke <tyler.brekke@inktank.com> Concubidated <tyler.brekke@inktank.com>
-Huang Jun <hjwsm1989@gmail.com> huang jun <hjwsm1989@gmail.com>
 Warren Usui <warren.usui@inktank.com> wusui <warren.usui@inktank.com>
-Florent Bautista <florent@coppint.com> FlorentCoppint <florent@coppint.com>
-Florent Flament <florent.flament@cloudwatt.com> <florent.flament-ext@cloudwatt.com>
-Michael Riederer <michael@riederer.org> dynamike67 <michael@riederer.org>
-Ilya Dryomov <ilya.dryomov@inktank.com> <idryomov@gmail.com>
-Aristoteles Neto <aristoteles.neto@webdrive.co.nz>  <wdneto@users.noreply.github.com>
-Ailing Zhang <zhangal1992@gmail.com> <ailzhang@users.noreply.github.com>
-Sushma Gurram <sushma.gurram@sandisk.com> sushma <sushma.gurram@sandisk.com>
-Stephen F Taylor <steveftaylor@gmail.com> <steve@DES-U1404-STETAY.stc.local>
-Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com> <sahid.ferdjaoui@gmail.com>
 Wei Luo <luowei@yahoo-inc.com> luowei <luowei@yahoo-inc.com>
-Lluis Pamies-Juarez <lluis.pamies-juarez@hgst.com> <lluis@pamies.cat>
-Dominik Hannen <cantares1+github@gmail.com> Dominik Hannen <dhxgit@users.noreply.github.com>
-Walter Huf <hufman@gmail.com> Walter J. Huf <hufman@gmail.com>
-Dmitry Smirnov <onlyjob@member.fsf.org> <onlyjob@debian.org>
-John Spray <jspray@redhat.com> <john.spray@redhat.com>
+Wido den Hollander <wido@42on.com> <wido@widodh.nl>
+Yan, Zheng <zheng.z.yan@intel.com> <ukernel@gmail.com>
+Yan, Zheng <zheng.z.yan@intel.com> Zheng Yan <zheng.z.yan@intel.com>
+Yan, Zheng <zheng.z.yan@intel.com> Zheng, Yan <zheng.z.yan@intel.com>
+Yehuda Sadeh <yehuda@inktank.com> <yehdua@inktank.com>
+Yehuda Sadeh <yehuda@inktank.com> <yehuda@hq.newdream.net>
+Yehuda Sadeh <yehuda@inktank.com> <yehudasa@ceph0.dreamhost.com>
+Yehuda Sadeh <yehuda@inktank.com> <yehuda.sadeh@dreamhost.com>
+Yehuda Sadeh <yehuda@inktank.com> <yehuda.sadeh@inktank.com>
+Yehuda Sadeh <yehuda@inktank.com> <yehudasa@fatty.ops.newdream.net>
+Yehuda Sadeh <yehuda@inktank.com> <yehudasa@gmail.com>
+Yehuda Sadeh <yehuda@inktank.com> <yehuda@yehuda>
+Yehuda Sadeh <yehuda@inktank.com> <yehuda@yehuda.infit.com>
 Yehuda Sadeh <ysadey@redhat.com> <yehuda@redhat.com>
-Brian Rak <dn@devicenull.org> devicenull <dn@devicenull.org>
-Sebastien Ponce <sebastien.ponce@cern.ch> Sebastien Ponce <Sebastien.Ponce@cern.ch>
diff --git a/.organizationmap b/.organizationmap
index 456c2648107f..9a449796572b 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -19,203 +19,202 @@
 #     9	     27 TCloud Computing <contact@tcloudcomputing.com>
 #    10	     22 GNU <contact@gnu.org>
 #
-Inktank <contact@inktank.com> Sage Weil <sage@inktank.com>
-Inktank <contact@inktank.com> Noah Watkins <noah.watkins@inktank.com>
-Inktank <contact@inktank.com> Yehuda Sadeh <yehuda@inktank.com>
-Inktank <contact@inktank.com> Greg Farnum <greg@inktank.com>
-Inktank <contact@inktank.com> Samuel Just <sam.just@inktank.com>
-Inktank <contact@inktank.com> Josh Durgin <josh.durgin@inktank.com>
-Inktank <contact@inktank.com> John Wilkins <john.wilkins@inktank.com>
-Inktank <contact@inktank.com> Dan Mick <dan.mick@inktank.com>
-Inktank <contact@inktank.com> João Eduardo Luís <joao.luis@inktank.com>
-Inktank <contact@inktank.com> Tommi Virtanen <tv@inktank.com>
-Inktank <contact@inktank.com> Gary Lowell <gary.lowell@inktank.com>
-Inktank <contact@inktank.com> David Zafman <david.zafman@inktank.com>
-Inktank <contact@inktank.com> Sam Lang <sam.lang@inktank.com>
-Inktank <contact@inktank.com> Caleb Miles <caleb.miles@inktank.com>
-Inktank <contact@inktank.com> Mike Ryan <mike.ryan@inktank.com>
+Anchor Hosting <contact@anchor.com.au> Christian Marie <pingu@anchor.net.au>
+Anchor Hosting <contact@anchor.com.au> Sharif Olorin <sio@tesser.org>
+ArtiBit <contact@artibit.com> Rutger ter Borg <rutger@terborg.net>
+Bayan <contact@bayan.co.ir> Mohammad Salehe <salehe+dev@gmail.com>
+Bigpoint.com <contact@bigpoint.net> Moritz Möller <mm@mxs.de>
+Canonical <contact@canonical.com> Chris Glass <tribaal@gmail.com>
+Canonical <contact@canonical.com> James Page <james.page@ubuntu.com>
+Canonical <contact@canonical.com> Jonathan Davies <jonathan.davies@canonical.com>
+Carnegie Mellon University <contact@cmu.edu> Jan Harkes <jaharkes@cs.cmu.edu>
+CCM Benchmark <contact@ccmbenchmark.com> Laurent Barbe <laurent@ksperis.com>
+CERN <contact@cern.ch> Andreas Peters <andreas.joachim.peters@cern.ch>
+CERN <contact@cern.ch> Dan van der Ster <daniel.vanderster@cern.ch>
+CERN <contact@cern.ch> Sebastien Ponce <sebastien.ponce@cern.ch>
+Choopa, LLC <contact@choopa.com> Adam Twardowski <adam.twardowski@gmail.com>
+CISCO <contact@cisco.com> Kai Zhang <zakir.exe@gmail.com>
+Cloudwatt <libre.licensing@cloudwatt.com> Christophe Courtaut <christophe.courtaut@gmail.com>
+Cloudwatt <libre.licensing@cloudwatt.com> Florent Flament <florent.flament@cloudwatt.com>
+Cloudwatt <libre.licensing@cloudwatt.com> Loic Dachary <loic@dachary.org>
+Cloudwatt <libre.licensing@cloudwatt.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
+Commerce Guys <contact@commerceguys.com> Nikola Kotur <kotnick@gmail.com>
+Corvisa LLC <contact@corvisa.com> Walter Huf <hufman@gmail.com>
+Credit Mutuel Arkea <contact@arkea.com> Eric Mourgaya <eric.mourgaya@arkea.com>
+Debian GNU/Linux <contact@debian.org> Bastian Blank <waldi@debian.org>
+Debian GNU/Linux <contact@debian.org> Dmitry Smirnov <onlyjob@member.fsf.org>
+Debian GNU/Linux <contact@debian.org> Laszlo Boszormenyi <gcs@debian.hu>
+Deutsche Telekom <contact@telekom.de> Daniel Gollub <d.gollub@telekom.de>
+Deutsche Telekom <contact@telekom.de> Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Deutsche Telekom <contact@telekom.de> Thomas Bechtold <t.bechtold@telekom.de>
+DreamHost <contact@dreamhost.com> Andrew Farmer <andrewf@hq.newdream.net>
+DreamHost <contact@dreamhost.com> Colin P. McCabe <colinm@hq.newdream.net>
+DreamHost <contact@dreamhost.com> Emily Popper <emily.popper@dreamhost.com>
+DreamHost <contact@dreamhost.com> Kyle Bader <kyle.bader@dreamhost.com>
+DreamHost <contact@dreamhost.com> Kyle Marsh <kyle.marsh@dreamhost.com>
+DreamHost <contact@dreamhost.com> Mark Kampe <mark.kampe@dreamhost.com>
+DreamHost <contact@dreamhost.com> Matthew Wodrich <matthew.wodrich@dreamhost.com>
+DreamHost <contact@dreamhost.com> Michael Rodriguez <michael@newdream.net>
+DreamHost <contact@dreamhost.com> Patience Warnick <patience@cranium.pelton.net>
+DreamHost <contact@dreamhost.com> Peter Vinson <peter@hq.newdream.net>
+DreamHost <contact@dreamhost.com> Pete V <peter@squid.newdream.net>
+DreamHost <contact@dreamhost.com> Sondra.Menthers <sondra.menthers@dreamhost.com>
+DreamHost <contact@dreamhost.com> Wesley Spikes <wesley.spikes@dreamhost.com>
+École polytechnique fédérale de Lausanne <contact@epfl.ch> Stefan Eilemann <Stefan.Eilemann@epfl.ch>
+eNovance <contact@enovance.com> Babu Shanmugam <anbu@enovance.com>
+eNovance <contact@enovance.com> Sebastien Han <sebastien.han@enovance.com>
+EPAM <contact@epam.com> Andrey Kuznetsov <Andrey_Kuznetsov@epam.com>
+GameServers.com <contact@gameservers.com> Brian Rak <dn@devicenull.org>
+Gentoo <contact@gentoo.org> Kacper Kowalik <xarthisius@gentoo.org>
+Gentoo <contact@gentoo.org> Robin H. Johnson <robbat2@gentoo.org>
+GNU <contact@gnu.org> Alexandre Oliva <oliva@gnu.org>
+gocept gmbh & co. kg <mail@gocept.com> Christian Theune <ct@gocept.com>
+GRNet <contact@grnet.gr> Filippos Giannakos <philipgian@grnet.gr>
+GRNet <contact@grnet.gr> Stratos Psomadakis <psomas@grnet.gr>
+GRNet <contact@grnet.gr> Vangelis Koukis <vkoukis@cslab.ece.ntua.gr>
+Hastexo <contact@hastexo.com> Florian Haas <florian@hastexo.com>
+HGST <contact@hgst.com> Kevin Dalley <kevin@kelphead.org>
+HGST <contact@hgst.com> Lluis Pamies-Juarez <lluis.pamies-juarez@hgst.com>
+Hostplex Hosting <contact@hostplex.net> Andras Elso <elso.andras@gmail.com>
+iNic <contact@inic.no> Bjørnar Ness <bjornar.ness@gmail.com>
+Inktank <contact@inktank.com> Alexandre Marangone <alexandre.marangone@inktank.com>
 Inktank <contact@inktank.com> Alex Elder <elder@inktank.com>
-Inktank <contact@inktank.com> Tamil Muthamizhan <tamil.muthamizhan@inktank.com>
 Inktank <contact@inktank.com> Alfredo Deza <alfredo.deza@inktank.com>
-Inktank <contact@inktank.com> Alexandre Marangone <alexandre.marangone@inktank.com>
-Inktank <contact@inktank.com> Ilya Dryomov <ilya.dryomov@inktank.com>
-Inktank <contact@inktank.com> Ross Turk <ross.turk@inktank.com>
-Inktank <contact@inktank.com> Peter Reiher <reiher@inktank.com>
-Inktank <contact@inktank.com> Sandon Van Ness <sandon@inktank.com>
+Inktank <contact@inktank.com> Caleb Miles <caleb.miles@inktank.com>
+Inktank <contact@inktank.com> Dan Mick <dan.mick@inktank.com>
+Inktank <contact@inktank.com> David Zafman <david.zafman@inktank.com>
 Inktank <contact@inktank.com> Eleanor Cawthon <eleanor.cawthon@inktank.com>
+Inktank <contact@inktank.com> Gary Lowell <gary.lowell@inktank.com>
+Inktank <contact@inktank.com> Greg Farnum <greg@inktank.com>
+Inktank <contact@inktank.com> Ilya Dryomov <ilya.dryomov@inktank.com>
+Inktank <contact@inktank.com> Jenkins <jenkins@inktank.com>
+Inktank <contact@inktank.com> João Eduardo Luís <joao.luis@inktank.com>
+Inktank <contact@inktank.com> Joe Buck <joe.buck@inktank.com>
+Inktank <contact@inktank.com> John Spray <john.spray@inktank.com>
+Inktank <contact@inktank.com> John Wilkins <john.wilkins@inktank.com>
+Inktank <contact@inktank.com> Josh Durgin <josh.durgin@inktank.com>
+Inktank <contact@inktank.com> Ken Dreyer <ken.dreyer@inktank.com>
+Inktank <contact@inktank.com> Mark Nelson <mark.nelson@inktank.com>
+Inktank <contact@inktank.com> Mike Ryan <mike.ryan@inktank.com>
 Inktank <contact@inktank.com> Neil Levine <neil.levine@inktank.com>
+Inktank <contact@inktank.com> Noah Watkins <noah.watkins@inktank.com>
 Inktank <contact@inktank.com> Patrick McGarry <patrick@inktank.com>
-Inktank <contact@inktank.com> Mark Nelson <mark.nelson@inktank.com>
+Inktank <contact@inktank.com> Peter Reiher <reiher@inktank.com>
+Inktank <contact@inktank.com> Ross Turk <ross.turk@inktank.com>
+Inktank <contact@inktank.com> Sage Weil <sage@inktank.com>
+Inktank <contact@inktank.com> Sam Lang <sam.lang@inktank.com>
+Inktank <contact@inktank.com> Samuel Just <sam.just@inktank.com>
+Inktank <contact@inktank.com> Sandon Van Ness <sandon@inktank.com>
+Inktank <contact@inktank.com> Tamil Muthamizhan <tamil.muthamizhan@inktank.com>
+Inktank <contact@inktank.com> Tommi Virtanen <tv@inktank.com>
 Inktank <contact@inktank.com> Tyler Brekke <tyler.brekke@inktank.com>
-Inktank <contact@inktank.com> Ken Dreyer <ken.dreyer@inktank.com>
-Inktank <contact@inktank.com> Joe Buck <joe.buck@inktank.com>
-Inktank <contact@inktank.com> John Spray <john.spray@inktank.com>
 Inktank <contact@inktank.com> Warren Usui <warren.usui@inktank.com>
-Inktank <contact@inktank.com> Jenkins <jenkins@inktank.com>
-DreamHost <contact@dreamhost.com> Patience Warnick <patience@cranium.pelton.net>
-DreamHost <contact@dreamhost.com> Colin P. McCabe <colinm@hq.newdream.net>
-DreamHost <contact@dreamhost.com> Michael Rodriguez <michael@newdream.net>
-DreamHost <contact@dreamhost.com> Sondra.Menthers <sondra.menthers@dreamhost.com>
-DreamHost <contact@dreamhost.com> Mark Kampe <mark.kampe@dreamhost.com>
-DreamHost <contact@dreamhost.com> Kyle Marsh <kyle.marsh@dreamhost.com>
-DreamHost <contact@dreamhost.com> Pete V <peter@squid.newdream.net>
-DreamHost <contact@dreamhost.com> Kyle Bader <kyle.bader@dreamhost.com>
-DreamHost <contact@dreamhost.com> Matthew Wodrich <matthew.wodrich@dreamhost.com>
-DreamHost <contact@dreamhost.com> Andrew Farmer <andrewf@hq.newdream.net>
-DreamHost <contact@dreamhost.com> Emily Popper <emily.popper@dreamhost.com>
-DreamHost <contact@dreamhost.com> Peter Vinson <peter@hq.newdream.net>
-DreamHost <contact@dreamhost.com> Wesley Spikes <wesley.spikes@dreamhost.com>
-Red Hat <contact@redhat.com> Sage Weil <sweil@redhat.com>
-Red Hat <contact@redhat.com> Noah Watkins <nwatkins@redhat.com>
-Red Hat <contact@redhat.com> Yehuda Sadeh <ysadey@redhat.com>
-Red Hat <contact@redhat.com> Greg Farnum <gfarnum@redhat.com>
-Red Hat <contact@redhat.com> Samuel Just <sjust@redhat.com>
-Red Hat <contact@redhat.com> Josh Durgin <jdurgin@redhat.com>
-Red Hat <contact@redhat.com> John Wilkins <jwilkins@redhat.com>
-Red Hat <contact@redhat.com> Dan Mick <dmick@redhat.com>
-Red Hat <contact@redhat.com> João Eduardo Luís <joao@redhat.com>
-Red Hat <contact@redhat.com> Gary Lowell <glowell@redhat.com>
-Red Hat <contact@redhat.com> David Zafman <dzafman@redhat.com>
-Red Hat <contact@redhat.com> Sam Lang <slang@redhat.com>
+Inktank <contact@inktank.com> Yehuda Sadeh <yehuda@inktank.com>
+Intel <contact@intel.com> Ma Jianpeng <jianpeng.ma@intel.com>
+Intel <contact@intel.com> Wang, Yaguang <yaguang.wang@intel.com>
+Intel <contact@intel.com> Yan, Zheng <zheng.z.yan@intel.com>
+Iron Systems Inc. <info@ironsystems.com> Harpreet Dhillon <harpreet@ironsystems.com>
+IT Refined <contact@itrefined.com> Ron Allred <rallred@itrefined.com>
+IWeb <contact@iweb.com> David Moreau Simard <dmsimard@iweb.com>
+Karlsruhe Institute of Technology <ceph@lists.kit.edu> Daniel J. Hofmann <daniel@trvx.org>
+Lebanon Evangelical School <contact@lesbg.com> Jonathan Dieter <jdieter@lesbg.com>
+Los Alamos National Laboratory <contact@lanl.gov> Esteban Molina-Estolano <eestolan@lanl.gov>
+Mirantis <contact@mirantis.com> Andrew Woodward <awoodward@mirantis.com>
+MIT Computer Science and Artificial Intelligence Laboratory <webmaster@csail.mit.edu> Stephen Jahl <stephenjahl@gmail.com>
+Pacific Northwest National Laboratory <contact@pnl.gov> Brown, David M JR <david.brown@pnl.gov>
+Pacific Northwest National Laboratory <contact@pnl.gov> Erwin, Brock A <Brock.Erwin@pnl.gov>
+Pacific Northwest National Laboratory <contact@pnl.gov> Evan Felix <evan.felix@pnnl.gov>
+Pacific Northwest National Laboratory <contact@pnl.gov> Scott Devoid <devoid@anl.gov>
+Piston Cloud Computing <info@pistoncloud.com> Mike Lundy <mike@fluffypenguin.org>
+Pogoapp <contact@pogoapp.com> Paul Meserve <paul@pogodan.com>
+Red Hat <contact@redhat.com> Alexandre Marangone <amarangone@redhat.com>
 Red Hat <contact@redhat.com> Alex Elder <aelder@redhat.com>
-Red Hat <contact@redhat.com> Tamil Muthamizhan <tmuthamizhan@redhat.com>
 Red Hat <contact@redhat.com> Alfredo Deza <adeza@redhat.com>
-Red Hat <contact@redhat.com> Alexandre Marangone <amarangone@redhat.com>
+Red Hat <contact@redhat.com> Dan Mick <dmick@redhat.com>
+Red Hat <contact@redhat.com> David Zafman <dzafman@redhat.com>
+Red Hat <contact@redhat.com> Gary Lowell <glowell@redhat.com>
+Red Hat <contact@redhat.com> Greg Farnum <gfarnum@redhat.com>
 Red Hat <contact@redhat.com> Ilya Dryomov <idryomov@redhat.com>
-Red Hat <contact@redhat.com> Ross Turk <rturk@redhat.com>
-Red Hat <contact@redhat.com> Neil Levine <nlevine@redhat.com>
-Red Hat <contact@redhat.com> Mark Nelson <mnelson@redhat.com>
-Red Hat <contact@redhat.com> Tyler Brekke <tbrekke@redhat.com>
-Red Hat <contact@redhat.com> Ken Dreyer <kdreyer@redhat.com>
+Red Hat <contact@redhat.com> João Eduardo Luís <joao@redhat.com>
 Red Hat <contact@redhat.com> John Spray <jspray@redhat.com>
-Red Hat <contact@redhat.com> Warren Usui <wusui@redhat.com>
+Red Hat <contact@redhat.com> John Wilkins <jwilkins@redhat.com>
+Red Hat <contact@redhat.com> Josh Durgin <jdurgin@redhat.com>
+Red Hat <contact@redhat.com> Ken Dreyer <kdreyer@redhat.com>
+Red Hat <contact@redhat.com> Mark Nelson <mnelson@redhat.com>
+Red Hat <contact@redhat.com> Neil Levine <nlevine@redhat.com>
+Red Hat <contact@redhat.com> Noah Watkins <nwatkins@redhat.com>
+Red Hat <contact@redhat.com> Ross Turk <rturk@redhat.com>
+Red Hat <contact@redhat.com> Sage Weil <sweil@redhat.com>
+Red Hat <contact@redhat.com> Sam Lang <slang@redhat.com>
+Red Hat <contact@redhat.com> Samuel Just <sjust@redhat.com>
+Red Hat <contact@redhat.com> Tamil Muthamizhan <tmuthamizhan@redhat.com>
 Red Hat <contact@redhat.com> Tom Callaway <spot@redhat.com>
+Red Hat <contact@redhat.com> Tyler Brekke <tbrekke@redhat.com>
 Red Hat <contact@redhat.com> Venky Shankar <vshankar@redhat.com>
-Unaffiliated <no@organization.net> Dominik Hannen <cantares1+github@gmail.com>
-Unaffiliated <no@organization.net> Huang Jun <hjwsm1989@gmail.com>
-Unaffiliated <no@organization.net> Dan Chai <tengweicai@gmail.com>
-Unaffiliated <no@organization.net> (no author) <(no author)@29311d96-e01e-0410-9327-a35deaab8ce9>
+Red Hat <contact@redhat.com> Warren Usui <wusui@redhat.com>
+Red Hat <contact@redhat.com> Yehuda Sadeh <ysadey@redhat.com>
+Roald van Loon Consultancy <roald@roaldvanloon.nl> Roald J. van Loon <roald@roaldvanloon.nl>
+Sandia National Laboratories <contact@sandia.gov> Jim Schutt <jaschut@sandia.gov>
+SanDisk <contact@sandisk.com> Allen Samuels <allen.samuels@sandisk.com>
+SanDisk <contact@sandisk.com> Somnath Roy <somnath.roy@sandisk.com>
+SanDisk <contact@sandisk.com> Sushma Gurram <sushma.gurram@sandisk.com>
+Science & Technology Facilities Council <contact@stfc.ac.uk> George Ryall <george.ryall@stfc.ac.uk>
+SendFaster <contact@sendfaster.com> Christopher O'Connell <jwriteclub@gmail.com>
+Spectra Logic <contact@spectralogic.com> Alan Somers <asomers@gmail.com>
+SUSE <contact@suse.com> David Disseldorp <ddiss@suse.de>
+SUSE <contact@suse.com> Hannes Reinecke <hare@suse.de>
+SUSE <contact@suse.com> Holger Macht <hmacht@suse.de>
+SWITCH <contact@switch.ch> Jens-Christian Fischer <jens-christian.fischer@switch.ch>
+SWITCH <contact@switch.ch> Simon Leinen <simon.leinen@switch.ch>
+TCloud Computing <contact@tcloudcomputing.com> CC Lien <cc_lien@tcloudcomputing.com>
+TCloud Computing <contact@tcloudcomputing.com> Henry C Chang <henry_c_chang@tcloudcomputing.com>
+TCloud Computing <contact@tcloudcomputing.com> Herb Shiu <herb_shiu@tcloudcomputing.com>
+TCloud Computing <contact@tcloudcomputing.com> Paul Chiang <paul_chiang@tcloudcomputing.com>
+The Linux Box <contact@linuxbox.com> Adam C. Emerson <aemerson@linuxbox.com>
+The Linux Box <contact@linuxbox.com> Casey Bodley <casey@linuxbox.com>
+The Linux Box <contact@linuxbox.com> Matt Benjamin <matt@linuxbox.com>
+The University of Arizona <contact@arizona.edu> James Ryan Cresawn <jrcresawn@gmail.com>
+Ubuntu Kylin <contact@ubuntukylin.com> Li Wang <liwang@ubuntukylin.com>
+Unaffiliated <no@organization.net> Accela Zhao <accelazh@gmail.com>
+Unaffiliated <no@organization.net> Ailing Zhang <zhangal1992@gmail.com> 
 Unaffiliated <no@organization.net> Colin Mattson <colinmattson@gmail.com>
-Unaffiliated <no@organization.net> Steve Stock <steve@technolope.org>
-Unaffiliated <no@organization.net> Michael Nelson <mikenel@tnld.net>
+Unaffiliated <no@organization.net> Dan Chai <tengweicai@gmail.com>
+Unaffiliated <no@organization.net> Dominik Hannen <cantares1+github@gmail.com>
 Unaffiliated <no@organization.net> Florent Bautista <florent@coppint.com>
+Unaffiliated <no@organization.net> Huang Jun <hjwsm1989@gmail.com>
+Unaffiliated <no@organization.net> Kevin Cox <kevincox@kevincox.ca>
 Unaffiliated <no@organization.net> koleosfuscus <koleosfuscus@yahoo.com>
-Unaffiliated <no@organization.net> Ailing Zhang <zhangal1992@gmail.com> 
-Unaffiliated <no@organization.net> Stephen F Taylor <steveftaylor@gmail.com>
+Unaffiliated <no@organization.net> Michael Nelson <mikenel@tnld.net>
 Unaffiliated <no@organization.net> Michael Riederer <michael@riederer.org>
+Unaffiliated <no@organization.net> (no author) <(no author)@29311d96-e01e-0410-9327-a35deaab8ce9>
 Unaffiliated <no@organization.net> Shawn Edwards <lesser.evil@gmail.com>
 Unaffiliated <no@organization.net> Stephen F Taylor <steveftaylor@gmail.com>
-Unaffiliated <no@organization.net> Kevin Cox <kevincox@kevincox.ca>
-Unaffiliated <no@organization.net> Accela Zhao <accelazh@gmail.com>
-Karlsruhe Institute of Technology <ceph@lists.kit.edu> Daniel J. Hofmann <daniel@trvx.org>
-SUSE <contact@suse.com> Holger Macht <hmacht@suse.de>
-SUSE <contact@suse.com> Hannes Reinecke <hare@suse.de>
-SUSE <contact@suse.com> David Disseldorp <ddiss@suse.de>
-Intel <contact@intel.com> Yan, Zheng <zheng.z.yan@intel.com>
-Intel <contact@intel.com> Wang, Yaguang <yaguang.wang@intel.com>
-Intel <contact@intel.com> Ma Jianpeng <jianpeng.ma@intel.com>
-HGST <contact@hgst.com> Kevin Dalley <kevin@kelphead.org>
-HGST <contact@hgst.com> Lluis Pamies-Juarez <lluis.pamies-juarez@hgst.com>
-Cloudwatt <libre.licensing@cloudwatt.com> Loic Dachary <loic@dachary.org>
-Cloudwatt <libre.licensing@cloudwatt.com> Christophe Courtaut <christophe.courtaut@gmail.com>
-Cloudwatt <libre.licensing@cloudwatt.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
-Cloudwatt <libre.licensing@cloudwatt.com> Florent Flament <florent.flament@cloudwatt.com>
-Wido 42on <contact@42on.com> Wido den Hollander <wido@42on.com>
-eNovance <contact@enovance.com> Babu Shanmugam <anbu@enovance.com>
-eNovance <contact@enovance.com> Sebastien Han <sebastien.han@enovance.com>
-Debian GNU/Linux <contact@debian.org> Laszlo Boszormenyi <gcs@debian.hu>
-Debian GNU/Linux <contact@debian.org> Bastian Blank <waldi@debian.org>
-Debian GNU/Linux <contact@debian.org> Dmitry Smirnov <onlyjob@member.fsf.org>
-SanDisk <contact@sandisk.com> Somnath Roy <somnath.roy@sandisk.com>
-SanDisk <contact@sandisk.com> Allen Samuels <allen.samuels@sandisk.com>
-SanDisk <contact@sandisk.com> Sushma Gurram <sushma.gurram@sandisk.com>
-Bigpoint.com <contact@bigpoint.net> Moritz Möller <mm@mxs.de>
-Credit Mutuel Arkea <contact@arkea.com> Eric Mourgaya <eric.mourgaya@arkea.com>
-GNU <contact@gnu.org> Alexandre Oliva <oliva@gnu.org>
-Hastexo <contact@hastexo.com> Florian Haas <florian@hastexo.com>
-Canonical <contact@canonical.com> James Page <james.page@ubuntu.com>
-Canonical <contact@canonical.com> Jonathan Davies <jonathan.davies@canonical.com>
-Canonical <contact@canonical.com> Chris Glass <tribaal@gmail.com>
-Ubuntu Kylin <contact@ubuntukylin.com> Li Wang <liwang@ubuntukylin.com>
-GRNet <contact@grnet.gr> Filippos Giannakos <philipgian@grnet.gr>
-GRNet <contact@grnet.gr> Stratos Psomadakis <psomas@grnet.gr>
-GRNet <contact@grnet.gr> Vangelis Koukis <vkoukis@cslab.ece.ntua.gr>
-IWeb <contact@iweb.com> David Moreau Simard <dmsimard@iweb.com>
-Gentoo <contact@gentoo.org> Robin H. Johnson <robbat2@gentoo.org>
-Gentoo <contact@gentoo.org> Kacper Kowalik <xarthisius@gentoo.org>
-YouScribe <contact@youscribe.fr> Guilhem Lettron <guilhem@lettron.fr>
-TCloud Computing <contact@tcloudcomputing.com> CC Lien <cc_lien@tcloudcomputing.com>
-TCloud Computing <contact@tcloudcomputing.com> Henry C Chang <henry_c_chang@tcloudcomputing.com>
-TCloud Computing <contact@tcloudcomputing.com> Paul Chiang <paul_chiang@tcloudcomputing.com>
-TCloud Computing <contact@tcloudcomputing.com> Herb Shiu <herb_shiu@tcloudcomputing.com>
-CERN <contact@cern.ch> Andreas Peters <andreas.joachim.peters@cern.ch>
-CERN <contact@cern.ch> Dan van der Ster <daniel.vanderster@cern.ch>
-CERN <contact@cern.ch> Sebastien Ponce <sebastien.ponce@cern.ch>
-SWITCH <contact@switch.ch> Jens-Christian Fischer <jens-christian.fischer@switch.ch>
-SWITCH <contact@switch.ch> Simon Leinen <simon.leinen@switch.ch>
-Yahoo! <contact@yahoo-inc.com> Haifeng Liu <haifeng@yahoo-inc.com>
-Yahoo! <contact@yahoo-inc.com> Xihui He <xihuihe@gmail.com>
-Yahoo! <contact@yahoo-inc.com> Ray Lv <xiangyulv@gmail.com>
-Yahoo! <contact@yahoo-inc.com> Guang Yang <yguang@yahoo-inc.com>
-Yahoo! <contact@yahoo-inc.com> Wei Luo <luowei@yahoo-inc.com>
+Unaffiliated <no@organization.net> Steve Stock <steve@technolope.org>
+Unilogic Networks B.V <contact@unilogicnetworks.net> Pascal de Bruijn <pascal@unilogicnetworks.net> 
 UnitedStack <contact@unitedstack.com> Guangliang Zhao <guangliang@unitedstack.com>
 UnitedStack <contact@unitedstack.com> Haomai Wang <haomaiwang@gmail.com>
 UnitedStack <contact@unitedstack.com> Kun Huang <academicgareth@gmail.com>
-Deutsche Telekom <contact@telekom.de> Danny Al-Gaaf <danny.al-gaaf@bisect.de>
-Deutsche Telekom <contact@telekom.de> Daniel Gollub <d.gollub@telekom.de>
-Deutsche Telekom <contact@telekom.de> Thomas Bechtold <t.bechtold@telekom.de>
-Mirantis <contact@mirantis.com> Andrew Woodward <awoodward@mirantis.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Adam Crume <adamcrume@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Andrew Leung <aleung@cs.ucsc.edu>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Carlos Maltzahn <carlosm@cs.ucsc.edu>
-University of California, Santa Cruz <contact@cs.ucsc.edu> Noah Watkins <noahwatkins@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Joe Buck <jbbuck@gmail.com>
-Roald van Loon Consultancy <roald@roaldvanloon.nl> Roald J. van Loon <roald@roaldvanloon.nl>
-University of Utah <contact@utah.edu> Xing Lin <xinglin@cs.utah.edu>
-Carnegie Mellon University <contact@cmu.edu> Jan Harkes <jaharkes@cs.cmu.edu>
+University of California, Santa Cruz <contact@cs.ucsc.edu> Noah Watkins <noahwatkins@gmail.com>
+University of Mississippi <contact@umd.edu> Derek Yarnell <derek@umiacs.umd.edu>
 University of Mississippi <contact@umd.edu> Liam Monahan <liam@umiacs.umd.edu>
 University of Mississippi <contact@umd.edu> Padraig O'Sullivan <posulliv@umd.edu>
-University of Mississippi <contact@umd.edu> Derek Yarnell <derek@umiacs.umd.edu>
-Sandia National Laboratories <contact@sandia.gov> Jim Schutt <jaschut@sandia.gov>
-Pacific Northwest National Laboratory <contact@pnl.gov> Erwin, Brock A <Brock.Erwin@pnl.gov>
-Pacific Northwest National Laboratory <contact@pnl.gov> Brown, David M JR <david.brown@pnl.gov>
-Pacific Northwest National Laboratory <contact@pnl.gov> Evan Felix <evan.felix@pnnl.gov>
-Pacific Northwest National Laboratory <contact@pnl.gov> Scott Devoid <devoid@anl.gov>
-Unilogic Networks B.V <contact@unilogicnetworks.net> Pascal de Bruijn <pascal@unilogicnetworks.net> 
-Los Alamos National Laboratory <contact@lanl.gov> Esteban Molina-Estolano <eestolan@lanl.gov>
-Choopa, LLC <contact@choopa.com> Adam Twardowski <adam.twardowski@gmail.com>
-CISCO <contact@cisco.com> Kai Zhang <zakir.exe@gmail.com>
-Anchor Hosting <contact@anchor.com.au> Christian Marie <pingu@anchor.net.au>
-Anchor Hosting <contact@anchor.com.au> Sharif Olorin <sio@tesser.org>
-Lebanon Evangelical School <contact@lesbg.com> Jonathan Dieter <jdieter@lesbg.com>
-Spectra Logic <contact@spectralogic.com> Alan Somers <asomers@gmail.com>
-Hostplex Hosting <contact@hostplex.net> Andras Elso <elso.andras@gmail.com>
-CCM Benchmark <contact@ccmbenchmark.com> Laurent Barbe <laurent@ksperis.com>
-Bayan <contact@bayan.co.ir> Mohammad Salehe <salehe+dev@gmail.com>
-ArtiBit <contact@artibit.com> Rutger ter Borg <rutger@terborg.net>
-IT Refined <contact@itrefined.com> Ron Allred <rallred@itrefined.com>
-The Linux Box <contact@linuxbox.com> Matt Benjamin <matt@linuxbox.com>
-The Linux Box <contact@linuxbox.com> Adam C. Emerson <aemerson@linuxbox.com>
-The Linux Box <contact@linuxbox.com> Casey Bodley <casey@linuxbox.com>
-The University of Arizona <contact@arizona.edu> James Ryan Cresawn <jrcresawn@gmail.com>
-EPAM <contact@epam.com> Andrey Kuznetsov <Andrey_Kuznetsov@epam.com>
-X-ION <contact@x-ion.de> Mouad Benchchaoui <m.benchchaoui@x-ion.de>
-X-ION <contact@x-ion.de> Stephan Renatus <s.renatus@x-ion.de>
-Piston Cloud Computing <info@pistoncloud.com> Mike Lundy <mike@fluffypenguin.org>
-SendFaster <contact@sendfaster.com> Christopher O'Connell <jwriteclub@gmail.com>
-iNic <contact@inic.no> Bjørnar Ness <bjornar.ness@gmail.com>
-Pogoapp <contact@pogoapp.com> Paul Meserve <paul@pogodan.com>
-Commerce Guys <contact@commerceguys.com> Nikola Kotur <kotnick@gmail.com>
-École polytechnique fédérale de Lausanne <contact@epfl.ch> Stefan Eilemann <Stefan.Eilemann@epfl.ch>
-Corvisa LLC <contact@corvisa.com> Walter Huf <hufman@gmail.com>
+University of Utah <contact@utah.edu> Xing Lin <xinglin@cs.utah.edu>
 VRT <contact@vrt.com.au> Stuart Longland <stuartl@vrt.com.au>
-gocept gmbh & co. kg <mail@gocept.com> Christian Theune <ct@gocept.com>
 Web Drive <contact@webdrive.co.nz> Aristoteles Neto <aristoteles.neto@webdrive.co.nz>
 Whatever <contact@whatever-company.com> Sylvain Munaut <s.munaut@whatever-company.com>
-Iron Systems Inc. <info@ironsystems.com> Harpreet Dhillon <harpreet@ironsystems.com>
-MIT Computer Science and Artificial Intelligence Laboratory <webmaster@csail.mit.edu> Stephen Jahl <stephenjahl@gmail.com>
-Science & Technology Facilities Council <contact@stfc.ac.uk> George Ryall <george.ryall@stfc.ac.uk>
-GameServers.com <contact@gameservers.com> Brian Rak <dn@devicenull.org>
+Wido 42on <contact@42on.com> Wido den Hollander <wido@42on.com>
+X-ION <contact@x-ion.de> Mouad Benchchaoui <m.benchchaoui@x-ion.de>
+X-ION <contact@x-ion.de> Stephan Renatus <s.renatus@x-ion.de>
+Yahoo! <contact@yahoo-inc.com> Guang Yang <yguang@yahoo-inc.com>
+Yahoo! <contact@yahoo-inc.com> Haifeng Liu <haifeng@yahoo-inc.com>
+Yahoo! <contact@yahoo-inc.com> Ray Lv <xiangyulv@gmail.com>
+Yahoo! <contact@yahoo-inc.com> Wei Luo <luowei@yahoo-inc.com>
+Yahoo! <contact@yahoo-inc.com> Xihui He <xihuihe@gmail.com>
+YouScribe <contact@youscribe.fr> Guilhem Lettron <guilhem@lettron.fr>
 #
 # Local Variables:
 # compile-command: "git log --pretty='%aN <%aE>' | \