[llvm-branch-commits] [cfe-branch] r195142 - Merging r195136:

[Bill Wendling]

Author: void
Date: Tue Nov 19 12:43:51 2013
New Revision: 195142

URL: http://llvm.org/viewvc/llvm-project?rev=195142&view=rev
Log:
Merging r195136:
------------------------------------------------------------------------

Modified:
    cfe/branches/release_34/   (props changed)

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 19 12:43:51 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135
+/cfe/trunk:195126,195128,195135-195136
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920