---

yaml
---
r: 218364
b: refs/heads/master
c: cdcce3b
h: refs/heads/master
v: v3

Author: bors

[refs]

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

trunk/.mailmap

@@ -8,12 +8,13 @@
 Aaron Todd <[email protected]>
 Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
 Ahmed Charles <[email protected]> <[email protected]>
+Aydin Kim <[email protected]> aydin.kim <[email protected]>
 Alex Lyon <[email protected]> <[email protected]>
 Alex Rønne Petersen <[email protected]>
 Andreas Gal <[email protected]> <[email protected]>
 Andrew Poelstra <[email protected]> <[email protected]>
 Anton Löfgren <[email protected]> <[email protected]>
-Ariel Ben-Yehuda <[email protected]> <[email protected]>
+Ariel Ben-Yehuda <[email protected]> arielb1 <[email protected]> <[email protected]>
 Austin Seipp <[email protected]> <[email protected]>
 Ben Alpert <[email protected]> <[email protected]>
 Benjamin Jackman <[email protected]>
@@ -38,13 +39,15 @@ Eduardo Bautista <[email protected]> <[email protected]>
 Eduardo Bautista <[email protected]> <=>
 Elliott Slaughter <[email protected]> <[email protected]>
 Elly Fong-Jones <[email protected]>
+Emily Dunham <[email protected]> edunham <[email protected]>
 Eric Holk <[email protected]> <[email protected]>
 Eric Holk <[email protected]> <[email protected]>
 Eric Holmes <[email protected]>
 Eric Reed <[email protected]> <[email protected]>
 Erick Tryzelaar <[email protected]> <[email protected]>
 Evgeny Sologubov
 Falco Hirschenberger <[email protected]> <[email protected]>
+Felix S. Klock II <[email protected]> Felix S Klock II <[email protected]>
 Gareth Daniel Smith <[email protected]>
 Georges Dubus <[email protected]> <[email protected]>
 Graham Fawcett <[email protected]> <[email protected]>
@@ -64,6 +67,7 @@ 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]>
+John Hodge <[email protected]> John Hodge <[email protected]>
 Jorge Aparicio <[email protected]> <[email protected]>
 Jonathan Bailey <[email protected]> <[email protected]>
 Junyoung Cho <[email protected]>
@@ -80,20 +84,24 @@ Luqman Aden <[email protected]> <[email protected]>
 Luke Metz <[email protected]>
 Makoto Nakashima <[email protected]> <[email protected]>
 Makoto Nakashima <[email protected]> gifnksm <[email protected]>
+Markus Westerlind <[email protected]> Markus <[email protected]>
 Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
 Mark Sinclair <[email protected]>
 Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
+Matej Lach <[email protected]> Matej Ľach <[email protected]>
 Matt Brubeck <[email protected]> <[email protected]>
 Matthew Auld <[email protected]>
 Matthew McPherrin <[email protected]> <[email protected]>
 Matthijs Hofstra <[email protected]>
 Michael Williams <[email protected]>
-Michael Woerister <michaelwoerister@gmail> <[email protected]>
-Michael Woerister <michaelwoerister@gmail> <michaelwoerister@posteo>
+Michael Woerister <michaelwoerister@gmail> <[email protected]> <michaelwoerister@posteo> Michael Woerister <michaelwoerister@posteo>
 Neil Pankey <[email protected]> <[email protected]>
 Nicholas Mazzuca <[email protected]> Nicholas <[email protected]>
+Oliver Schneider <[email protected]> <[email protected]> <[email protected]> Oliver 'ker' Schneider <[email protected]>
 Ožbolt Menegatti <[email protected]> gareins <[email protected]>
+Paul Faria <[email protected]> Paul Faria <[email protected]>
 Peer Aramillo Irizar <[email protected]> parir <[email protected]>
+Peter Elmers <[email protected]> <[email protected]>
 Philipp Brüschweiler <[email protected]> <[email protected]>
 Philipp Brüschweiler <[email protected]> <[email protected]>
 Pradeep Kumar <[email protected]>
@@ -105,6 +113,7 @@ Robert Foss <[email protected]> robertfoss <[email protected]>
 Robert Gawdzik <[email protected]> Robert Gawdzik ☢ <[email protected]>
 Robert Millar <[email protected]>
 Ryan Scheel <[email protected]>
+Sean Gillespie <[email protected]> swgillespie <[email protected]>
 Seonghyun Kim <[email protected]>
 Simon Barber-Dueck <[email protected]> Simon BD <simon@server>
 Simon Sapin <[email protected]> <[email protected]>
@@ -114,7 +123,9 @@ Steven Stewart-Gallus <[email protected]> <sstewartgallus00@mylanga
 Tamir Duberstein <[email protected]> Tamir Duberstein <[email protected]>
 Tim Chevalier <[email protected]> <[email protected]>
 Torsten Weber <[email protected]> <[email protected]>
+Vadim Petrochenkov <[email protected]> petrochenkov <[email protected]>
 William Ting <[email protected]> <[email protected]>
+Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
 Youngsoo Son <[email protected]> <[email protected]>
 Zack Corr <[email protected]> <[email protected]>
 Zack Slayton <[email protected]>