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)
1  2 
compiler/main/DriverPipeline.hs
compiler/main/DynFlags.hs

Simple merge
Simple merge