John Ericson cebda2ffd0 Merge remote-tracking branch 'upstream/master' into staging		2018-06-13 21:18:24 -04:00
..
bsd	netbsd.locale: init	2018-06-11 14:47:47 -04:00
darwin	Merge master into staging	2018-06-10 10:10:42 +02:00
gnu	Merge pull request #40530 from obsidiansystems/mingw-cleanup	2018-05-14 21:05:44 -04:00
linux	Merge remote-tracking branch 'upstream/master' into staging	2018-06-13 21:18:24 -04:00
windows	Merge pull request #40530 from obsidiansystems/mingw-cleanup	2018-05-14 21:05:44 -04:00