---

yaml
---
r: 214011
b: refs/heads/master
c: d7b1fd3
h: refs/heads/master
i:
  214009: eba1c4f
  214007: fe13e57
v: v3

Author: Manishearth

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a8680deb7f950f48b5807a887944fa73af723507
+refs/heads/master: d7b1fd3eb1a3518ccbf52e73fb3ea32461b05f9a
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/.mailmap

@@ -6,6 +6,7 @@
 #
 
 Aaron Todd <[email protected]>
+Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
 Ahmed Charles <[email protected]> <[email protected]>
 Alex Lyon <[email protected]> <[email protected]>
 Alex Rønne Petersen <[email protected]>
@@ -22,13 +23,16 @@ Boris Egorov <[email protected]> <[email protected]>
 Brian Anderson <[email protected]> <[email protected]>
 Brian Dawn <[email protected]>
 Carl-Anton Ingmarsson <[email protected]> <[email protected]>
+Carol (Nichols || Goulding) <[email protected]> Carol Nichols <[email protected]>
 Carol Willing <[email protected]>
 Chris Pressey <[email protected]>
 Clark Gaebel <[email protected]> <[email protected]>
+Corey Farwell <[email protected]> Corey Farwell <[email protected]>
 David Klein <[email protected]>
 David Manescu <[email protected]> <[email protected]>
 Damien Schoof <[email protected]>
 Derek Chiang <[email protected]> Derek Chiang (Enchi Jiang) <[email protected]>
+Diggory Hardy <[email protected]> Diggory Hardy <[email protected]>
 Dylan Braithwaite <[email protected]> <[email protected]>
 Eduardo Bautista <[email protected]> <[email protected]>
 Eduardo Bautista <[email protected]> <=>
@@ -44,7 +48,7 @@ Falco Hirschenberger <[email protected]> <[email protected]>
 Gareth Daniel Smith <[email protected]>
 Georges Dubus <[email protected]> <[email protected]>
 Graham Fawcett <[email protected]> <[email protected]>
-Graydon Hoare <graydon@mozilla.com> <graydon@pobox.com>
+Graydon Hoare <graydon@pobox.com> Graydon Hoare <graydon@mozilla.com>
 Heather <[email protected]> <[email protected]>
 Heather <[email protected]> <[email protected]>
 Ilyong Cho <[email protected]>
@@ -58,6 +62,7 @@ Jason Orendorff <[email protected]> <[email protected]>
 Jeremy Letang <[email protected]>
 Jihyun Yu <[email protected]> jihyun <[email protected]>
 Jihyun Yu <[email protected]> <[email protected]>
+Johann Hofmann <[email protected]> Johann <[email protected]> Johann Hofmann <[email protected]>
 John Clements <[email protected]> <[email protected]>
 Jorge Aparicio <[email protected]> <[email protected]>
 Jonathan Bailey <[email protected]> <[email protected]>
@@ -86,11 +91,17 @@ Michael Williams <[email protected]>
 Michael Woerister <michaelwoerister@gmail> <[email protected]>
 Michael Woerister <michaelwoerister@gmail> <michaelwoerister@posteo>
 Neil Pankey <[email protected]> <[email protected]>
+Nicholas Mazzuca <[email protected]> Nicholas <[email protected]>
+Ožbolt Menegatti <[email protected]> gareins <[email protected]>
+Peer Aramillo Irizar <[email protected]> parir <[email protected]>
 Philipp Brüschweiler <[email protected]> <[email protected]>
 Philipp Brüschweiler <[email protected]> <[email protected]>
 Pradeep Kumar <[email protected]>
+Przemysław Wesołek <[email protected]> Przemek Wesołek <[email protected]>
+Ralph Giles <[email protected]> Ralph Giles <[email protected]>
 Richard Diamond <[email protected]> <[email protected]>
 Rob Arnold <[email protected]>
+Robert Foss <[email protected]> robertfoss <[email protected]>
 Robert Gawdzik <[email protected]> Robert Gawdzik ☢ <[email protected]>
 Robert Millar <[email protected]>
 Ryan Scheel <[email protected]>
@@ -100,6 +111,7 @@ Simon Sapin <[email protected]> <[email protected]>
 startling <[email protected]>
 Steven Fackler <[email protected]> <[email protected]>
 Steven Stewart-Gallus <[email protected]> <[email protected]>
+Tamir Duberstein <[email protected]> Tamir Duberstein <[email protected]>
 Tim Chevalier <[email protected]> <[email protected]>
 Torsten Weber <[email protected]> <[email protected]>
 William Ting <[email protected]> <[email protected]>