Commits

Jordan Rose committed 2ad796627a2
Revert "Prefer compiler-provided conformances to those required by other protocols." This may not be the right solution. Even if it is, there are SourceKit tests that need updating. This reverts commit r28849 / rdar://problem/21007417. Swift SVN r28852