tree b66656e6c433f88b53cb17fa6939bdcd39629bf2
parent 17f727b492b580ec803115b1fedb049f6cdd98e9
parent bf357568d74cf19e447742eecdad84e9e8bdc66e
author swift-ci <swift-ci@users.noreply.github.com> 1499272990 -0700
committer swift-ci <swift-ci@users.noreply.github.com> 1499272990 -0700

Merge remote-tracking branch 'origin/swift-4.0-branch' into stable