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

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

http://hackage.haskell.org/trac/ghc/changeset/c32283ab8f1d4d482ce4e617828e486093d537eb

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

commit c32283ab8f1d4d482ce4e617828e486093d537eb
Merge: 2de9642... 6078f13...
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Dec 4 13:59:18 2012 -0500

    Merge branch 'master' into overlapping-tyfams
    
    Conflicts:
    	template-haskell.cabal

 template-haskell.cabal |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)