Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Feb 2013 17:29:56 +0000 (17:29 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Feb 2013 17:29:56 +0000 (17:29 +0000)
1  2 
compiler/specialise/Specialise.lhs

Simple merge