Merge the Michaels

mwaskom · mwaskom · commit 66d8dcf32874 · 2014-06-14T12:37:18.000-07:00
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1 @@
+Michael Waskom <mwaskom@stanford.edu> mwaskom <mwaskom@stanford.edu>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Michael Waskom <[email protected]> mwaskom <[email protected]>`