[commit: template-haskell] overlapping-tyfams's head updated: Merge branch 'master' into overlapping-tyfams (b006d7e)

[Richard Eisenberg]

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

Branch 'overlapping-tyfams' now includes:

     ccd7891... Implement overlapping type family instances.
     0b8e8c0... some more typos
     77a9224... Add "deprecated in" comments to deprecated pragmas
     2c9df50... Fix typo
     30d5fd7... "Merged" master before update to "Good"
     e2f97b1... Revert ""Merged" master before update to "Good""
     d1127a5... Merge commit 'ccd7891' into overlapping-tyfams
     5d1742c... Merge branch 'master' into overlapping-tyfams
     02ba3a2... Add type space declarations to branched type family instances.
     4f30109... Revert "Add type space declarations to branched type family instances."
     b9dc6ad... Changed syntax to allow closed type families
     aeca864... Fix warning.
     e4f742d... Update to support closed type families.
     b006d7e... Merge branch 'master' into overlapping-tyfams