[reactos] 02/02: Merge branch 'master' of https://github.com/reactos/reactos

[jimtabor]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=343d6ea6dcd19673c5b0cf...

commit 343d6ea6dcd19673c5b0cf6872e5033abe897be2
Merge: 68df5a50e6 be54b37dd6
Author:     jimtabor [e-mail]
AuthorDate: Mon Mar 18 17:30:01 2019 -0500
Commit:     jimtabor [e-mail]
CommitDate: Mon Mar 18 17:30:01 2019 -0500

Merge branch 'master' of https://github.com/reactos/reactos

dll/win32/userenv/profile.c | 102 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 80 insertions(+), 22 deletions(-)