Merge branch '5.3.x'

sbrannen · sbrannen · commit 22ef3ec783f4 · 2022-06-07T14:30:45.000+02:00
# Conflicts:
#	.mailmap
diff --git a/.mailmap b/.mailmap
@@ -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>

-Original file line number
+Diff line change
 Andy Clement <[email protected]> <[email protected]>
 Andy Clement <[email protected]> <[email protected]>
 Andy Clement <[email protected]> <[email protected]>
 +Sam Brannen <[email protected]>
 +Sam Brannen <[email protected]> <[email protected]>
 +Sam Brannen <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 Nick Williams <[email protected]>