[llvm-branch-commits] [llvm-branch] r183190 - Merging r181909:

[Bill Wendling]

Author: void
Date: Mon Jun  3 23:36:20 2013
New Revision: 183190

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

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

Propchange: llvm/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun  3 23:36:20 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,181286,181296,181313,181363,181366,181397,181423,181450,181524,181529,181540,181576-181580,181586,181600,181678,181706,181792,181800,181842,181864,182072,182112-182113,182253-182254,182297-182298,182344,182364,182385,182387,182394,182485-182486,182585,182656,183035,183108
+/llvm/trunk:155241,181286,181296,181313,181363,181366,181397,181423,181450,181524,181529,181540,181576-181580,181586,181600,181678,181706,181792,181800,181842,181864,181909,182072,182112-182113,182253-182254,182297-182298,182344,182364,182385,182387,182394,182485-182486,182585,182656,183035,183108