TEST / swift234 / 8b42212543d

Commits

Ben Langmuir committed 8b42212543dM11 Aug 2016

Merge remote-tracking branch 'benlangmuir/fixit-protocol-comp'

Conflicts:
	lib/FrontendTool/FrontendTool.cpp
	test/FixCode/fixits-apply.swift
	test/FixCode/fixits-apply.swift.result

Showing diff toec539d6abf8