--- Merging r127811 into '.':

A    test/SemaCXX/auto-subst-failure.cpp
U    include/clang/Sema/Sema.h
U    lib/Sema/SemaDeclCXX.cpp
U    lib/Sema/SemaExprCXX.cpp
U    lib/Sema/SemaDecl.cpp
U    lib/Sema/SemaTemplateDeduction.cpp
--- Merging r127971 into '.':
U    tools/libclang/CIndex.cpp

llvm-svn: 128026