[ghc-contravariant/f20: 4/4] Merge origin/master into f20

[Jens Petersen]

commit 19fb3c11b039aaa5b4c141800fc87ea9b33842a4
Merge: 8d13f2d 7aafa2f
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jul 4 19:54:30 2014 +0900

    Merge origin/master into f20

 .gitignore                                         |    2 +-
 ...ravariant-0.6-without-transformers-compat.patch |   13 -------------
 ...contravariant-without-transformers-compat.patch |   12 ++++++++++++
 ghc-contravariant.spec                             |    8 ++++----
 sources                                            |    2 +-
 5 files changed, 18 insertions(+), 19 deletions(-)
---