Reported by "Michael H. Warfield" <mhw@WittsEnd.com>.
Trying to add a domain user as a local user on the machine gives:
"The user could not be added because the following error has occurred:
The trust relationship between this workstation and the primary domain
Created attachment 6027 [details]
git-am fix for 3.5.x.
This fix has been tested by Mike Warfield and Dan Shearer. Volker, if you're happy please re-assign to Karolin for inclusion in 3.5.next.
Pushed to v3-5-test.
Closing out bug report.