Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Waern <david.waern@gmail.com>
Fri, 25 Nov 2011 23:02:29 +0000 (00:02 +0100)
committerDavid Waern <david.waern@gmail.com>
Fri, 25 Nov 2011 23:02:29 +0000 (00:02 +0100)
commitfdf98d6255deba9582dd475e6953b1bb49fba660
tree839d39e5cdb3ec89868ed74705464b0674cd69b3
parentee2dad13f8a3cd484f25aa949895535d6eb0f15e
parent381becf01a71654464a8c73ba8f4671337ebae9a
Merge branch 'master' of darcs.haskell.org/ghc
compiler/parser/Lexer.x