Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 18 Mar 2012 22:26:11 +0000 (15:26 -0700)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 18 Mar 2012 22:26:11 +0000 (15:26 -0700)
commit50005faa80f3a868dc4a013b7d9edfe0b8422b26
treecaf9db52f2e2b8173204b1100b92949a20e1053a
parentb058d9716b4980408f9cf23adfc4f3ef8ba451be
parent6f72869e180d0b0c88386adf1d6e75241596b2b5
Merge remote-tracking branch 'origin/master' into type-nats
libraries/template-haskell/Language/Haskell/TH/Lib.hs
libraries/template-haskell/Language/Haskell/TH/Ppr.hs
libraries/template-haskell/Language/Haskell/TH/Syntax.hs