Merge branch 'master' of https://github.com/ghc/ghc
authorJohan Tibell <johan.tibell@gmail.com>
Fri, 11 Jan 2013 21:00:41 +0000 (13:00 -0800)
committerJohan Tibell <johan.tibell@gmail.com>
Fri, 11 Jan 2013 21:00:41 +0000 (13:00 -0800)
commit5427df8f466e62f154051f957f834f9e7837ea16
tree517c36f2934d3c880853b053333d13eef008520c
parentbab8dc7925a374ef91df3bca3d9a2aa9755212e1
parentacb0cd9485b3f9eb96480ff25b00b66038e1b090
Merge branch 'master' of https://github.com/ghc/ghc
compiler/main/DriverPipeline.hs
compiler/main/DynFlags.hs