--- Merging r127541 into '.':

U    test/CXX/special/class.inhctor/p3.cpp
U    test/CXX/special/class.inhctor/elsewhere.cpp
U    test/CXX/special/class.inhctor/p7.cpp
U    include/clang/Basic/DiagnosticSemaKinds.td
U    lib/Sema/SemaDeclCXX.cpp

llvm-svn: 127614