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

[gedmurphy]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=637276f1abd7e8fdd5a54…

commit 637276f1abd7e8fdd5a54bd4ea2f03ecbd0e3e7d
Merge: 650cca217a 1473c522cf
Author: gedmurphy <gedmurphy(a)reactos.org>
AuthorDate: Thu Oct 12 21:36:29 2017 +0100

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