Merge branch 'master' into ghc-parmake-gsoc
authorPatrick Palka <patrick@parcs.ath.cx>
Fri, 30 Aug 2013 16:54:22 +0000 (12:54 -0400)
committerPatrick Palka <patrick@parcs.ath.cx>
Fri, 30 Aug 2013 16:54:22 +0000 (12:54 -0400)
commit26bf3dd478dce53eb50c2ce13821d61e416e3fe7
tree7b025b1eca208e96cf5e1916dd12f0054fda79ea
parent6d755c08ca125d991a95fbdc3ae1dc0608b722f1
parent85c1715d086bf2d35bc05133398f462919f2aa7b
Merge branch 'master' into ghc-parmake-gsoc

Conflicts:
compiler/main/DynFlags.hs
compiler/utils/FastString.lhs
compiler/main/DynFlags.hs
compiler/main/GhcMake.hs
compiler/main/SysTools.lhs
compiler/main/TidyPgm.lhs
ghc/InteractiveUI.hs