Merge branch 'bug/13443_vm_template_ballooning' into release/0.10
[ganeti_webmgr.git] / .mailmap
blob3b4424feb0ffcc4c8dcd24f5e2c0ad4c26b7eddd
1 Corbin Simpson <simpsoco@osuosl.org> <MostAwesomeDude@gmail.com>
2 Emily Dunham <edunham@osuosl.org>
3 Peter Krenesky <peter@osuosl.org> <peter@hendrix.(none)>
4 Peter Krenesky <peter@osuosl.org> <peter@osl-Latitude-E4300.(none)>
5 <rob@osuosl.org> <rob@ent.(none)> 
6 <rob@osuosl.org> <rob.mcguiredale+git@gmail.com>
7 <rob@osuosl.org> <rob.mcguiredale@gmail.com>
8 Scott White <whiteau@osuosl.org> <whiteau@Gomez.(none)>
9 <bramwelt@osuosl.org> <tehriddler@gmail.com>
10 Jonah Brooks <brookjon@osuosl.org> <brookjon@ubuntu.ubuntu-domain>
11 <dearej@osuosl.org> <dearej@aqua.workstation.osuosl.org>
12 <andrewfree@osuosl.org> <andrewfree@orange.workstation.osuosl.org>