[commit: template-haskell] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (5d1742c)

[Richard Eisenberg]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/template-haskell

On branch  : overlapping-tyfams

http://hackage.haskell.org/trac/ghc/changeset/5d1742c537e0ba8ca37bfef695a158ae6cfec724

>---------------------------------------------------------------

commit 5d1742c537e0ba8ca37bfef695a158ae6cfec724
Merge: d1127a5... 2c9df50...
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri May 24 23:31:37 2013 +0100

    Merge branch 'master' into overlapping-tyfams

 Language/Haskell/TH/Ppr.hs    |    2 +-
 Language/Haskell/TH/Syntax.hs |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)