---

yaml
---
r: 157179
b: refs/heads/master
c: c40fc79
h: refs/heads/master
i:
  157177: df7995c
  157175: a30a913
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b9251cded8567b5bcabf9378661cf40fe35dc17b
+refs/heads/master: c40fc79a1adb2564c6233605771bdeaecf348864
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: d44ea720fa9dfe062ef06d0eb49a58d4e7e92344
 refs/heads/try: 6ecdf1fa83d7cdbf44a0091132e9c6580be72275

trunk/.mailmap

@@ -5,8 +5,104 @@
 # email addresses.
 #
 
-Elly Jones <[email protected]>
-ILyoan <[email protected]>
+Aaron Todd <[email protected]>
+Ahmed Charles <[email protected]> <[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]>
+Austin Seipp <[email protected]> <[email protected]>
+Ben Alpert <[email protected]> <[email protected]>
+Benjamin Jackman <[email protected]>
+Björn Steinbrink <[email protected]> <[email protected]>
+blake2-ppc <[email protected]> <blake2-ppc>
+Boris Egorov <[email protected]> <[email protected]>
+Brian Anderson <[email protected]> <[email protected]>
+Brian Dawn <[email protected]>
+Carl-Anton Ingmarsson <[email protected]> <[email protected]>
+Carol Willing <[email protected]>
+Chris Pressey <[email protected]>
+Clark Gaebel <[email protected]> <[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]>
+Dylan Braithwaite <[email protected]> <[email protected]>
+Eduardo Bautista <[email protected]> <[email protected]>
+Eduardo Bautista <[email protected]> <=>
+Elliott Slaughter <[email protected]> <[email protected]>
+Elly Fong-Jones <[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]>
+Gareth Daniel Smith <[email protected]>
+Georges Dubus <[email protected]> <[email protected]>
+Graham Fawcett <[email protected]> <[email protected]>
+Graydon Hoare <[email protected]> <[email protected]>
+Heather <[email protected]> <[email protected]>
+Heather <[email protected]> <[email protected]>
+Ilyong Cho <[email protected]>
+J. J. Weber <[email protected]>
+Jakub Bukaj <[email protected]>
+Jakub Bukaj <[email protected]> <[email protected]>
+James Deng <[email protected]> <[email protected]>
+James Miller <[email protected]> <[email protected]>
+Jason Orendorff <[email protected]> <[email protected]>
+Jason Orendorff <[email protected]> <[email protected]>
+Jeremy Letang <[email protected]>
+Jihyun Yu <[email protected]> jihyun <[email protected]>
+Jihyun Yu <[email protected]> <[email protected]>
+John Clements <[email protected]> <[email protected]>
+Jorge Aparicio <[email protected]> <[email protected]>
+Jonathan Bailey <[email protected]> <[email protected]>
 Junyoung Cho <[email protected]>
+Jyun-Yan You <[email protected]> <[email protected]>
+Kang Seonghoon <[email protected]> <[email protected]>
+Keegan McAllister <[email protected]> <[email protected]>
+Kyeongwoon Lee <[email protected]>
+Lee Wondong <[email protected]>
+Lennart Kudling <[email protected]>
+Lindsey Kuper <[email protected]> <[email protected]>
+Lindsey Kuper <[email protected]> <[email protected]>
+Luqman Aden <[email protected]> <[email protected]>
+Luqman Aden <[email protected]> <[email protected]>
+Luke Metz <[email protected]>
+Makoto Nakashima <[email protected]> <[email protected]>
+Makoto Nakashima <[email protected]> gifnksm <[email protected]>
+Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
+Mark Sinclair <[email protected]>
+Mark Sinclair <[email protected]> =Mark Sinclair <[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>
+Neil Pankey <[email protected]> <[email protected]>
+Philipp Brüschweiler <[email protected]> <[email protected]>
+Philipp Brüschweiler <[email protected]> <[email protected]>
+Pradeep Kumar <[email protected]>
+Richard Diamond <[email protected]> <[email protected]>
 Rob Arnold <[email protected]>
+Robert Gawdzik <[email protected]> Robert Gawdzik ☢ <[email protected]>
+Robert Millar <[email protected]>
+Ryan Scheel <[email protected]>
+Seonghyun Kim <[email protected]>
+Simon Barber-Dueck <[email protected]> Simon BD <simon@server>
+Simon Sapin <[email protected]> <[email protected]>
+startling <[email protected]>
+Steven Fackler <[email protected]> <[email protected]>
+Steven Stewart-Gallus <[email protected]> <[email protected]>
+Tim Chevalier <[email protected]> <[email protected]>
+Torsten Weber <[email protected]> <[email protected]>
+William Ting <[email protected]> <[email protected]>
+Youngsoo Son <[email protected]> <[email protected]>
+Zack Corr <[email protected]> <[email protected]>
+Zack Slayton <[email protected]>