Conflicts:
	docs/LanguageExtensions.html
	include/clang/Basic/DiagnosticSemaKinds.td
	lib/AST/ExprConstant.cpp
	lib/Sema/SemaDeclCXX.cpp
	test/SemaCXX/constant-expression-cxx11.cpp