[llvm-branch-commits] [llvm-branch] r182141 - Merging r182072:

[Bill Wendling]

Author: void
Date: Fri May 17 13:46:38 2013
New Revision: 182141

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

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

Propchange: llvm/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 17 13:46:38 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,181286,181296,181313,181397,181423,181450,181524,181529,181540,181576-181580,181586,181792,181800,181842
+/llvm/trunk:155241,181286,181296,181313,181397,181423,181450,181524,181529,181540,181576-181580,181586,181792,181800,181842,182072