tree 609c3e8cbdea63e107727c1a488ab8c4928f53f6
parent 76d1ba12e0ac32370074116a4ed10903275c606d
parent 710947c723491db86b59a1d2200f46e502235d57
author swift-ci <swift-ci@users.noreply.github.com> 1472240722 -0700
committer swift-ci <swift-ci@users.noreply.github.com> 1472240722 -0700

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

* origin/swift-3.0-branch:
  clang/test/Modules/prebuilt-module.m: Prune "-triple" to fix a configuration mismatch.