Merge branch '5.3.x'

# Conflicts: # .mailmap
4 years ago · 22ef3ec783
1 changed files with 3 additions and 0 deletions
--- a/.mailmap
+++ b/.mailmap
@ -27,5 +27,8 @@ Andy Clement <aclement@vmware.com>
				@@ -27,5 +27,8 @@ Andy Clement <aclement@vmware.com>
 Andy Clement <aclement@vmware.com> <aclement@pivotal.io>
 Andy Clement <aclement@vmware.com> <aclement@gopivotal.com>
 Andy Clement <aclement@vmware.com> <andrew.clement@gmail.com>
+Sam Brannen <sbrannen@vmware.com>
+Sam Brannen <sbrannen@vmware.com> <sbrannen@pivotal.io>
+Sam Brannen <sbrannen@vmware.com> <sam@sambrannen.com>
 <dmitry.katsubo@gmail.com> <dmitry.katsubo@gmai.com>
 Nick Williams <nicholas@nicholaswilliams.net>