From 42550da8a5ffc4100842ecec7acc0eefd192aa56 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Tue, 23 Sep 2014 23:07:41 -0700
Subject: [PATCH] Update github committers.

---
 .mailmap   | 6 ++++++
 History.md | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 5ee6fc5e71..550b1158e2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -41,6 +41,7 @@ GITHUB: marcandre <github@marc-andre.ca>
 GITHUB: mart-jansink <m.jansink@gmail.com>
 GITHUB: MaximDubrovin <maxxdubrovin@gmail.com>
 GITHUB: meawoppl <meawoppl@gmail.com>
+GITHUB: meonkeys <haircut@gmail.com>
 GITHUB: michaelbishop <michael@michaelsplace.net>
 GITHUB: mitar <mitar.git@tnode.com>
 GITHUB: mitar <mitar.github@tnode.com>
@@ -50,6 +51,7 @@ GITHUB: nathan-muir <ndmuir@gmail.com>
 GITHUB: Neftedollar <oildollar@gmail.com>
 GITHUB: paulswartz <paulswartz@gmail.com>
 GITHUB: Pent <jon@empire5design.com>
+GITHUB: prapicault <pascal@rapicault.net>
 GITHUB: queso <joshua.owens@gmail.com>
 GITHUB: rcy <rcyeske@gmail.com>
 GITHUB: RichardLitt <richard.littauer@gmail.com>
@@ -64,11 +66,15 @@ GITHUB: thatneat <thatneat@users.noreply.github.com>
 GITHUB: timhaines <tmhaines@gmail.com>
 GITHUB: tmeasday <tom@thesnail.org>
 GITHUB: twhy <tom.wanghaiyi@gmail.com>
+GITHUB: waitingkuo <waitingkuo0527@gmail.com>
+GITHUB: wulfmeister <wulfmeister@users.noreply.github.com>
 GITHUB: yeputons <egor.suvorov@gmail.com>
 GITHUB: zol <zol@percolatestudio.com>
 
 METEOR: arbesfeld <arbesfeld@gmail.com>
 METEOR: avital <avital@thewe.net>
+METEOR: ben <ben@meteor.com>
+METEOR: ben <bn@cs.stanford.edu>
 METEOR: debergalis <matt@meteor.com>
 METEOR: dgreensp <dgreenspan@alum.mit.edu>
 METEOR: ekatek <ekate@meteor.com>
diff --git a/History.md b/History.md
index b5b57de161..bcff9707f9 100644
--- a/History.md
+++ b/History.md
@@ -55,7 +55,7 @@ will not be able to use versions of packages that use the new features.
   enable data peristance during hot code push.
 
 
-XXX patches contributed by
+Patches by Github users meonkeys, mitar, mizzao, mquandalle, prapicault, waitingkuo, wulfmeister