[llvm-branch-commits] [cfe-branch] r181456 - Merging r181286:

[Bill Wendling]

Author: void
Date: Wed May  8 13:14:18 2013
New Revision: 181456

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

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

Propchange: cfe/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  8 13:14:18 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:181299,181368
+/cfe/trunk:181286,181299,181368
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920