[cabal-rpm/el5: 7/7] Merge remote-tracking branch 'origin' into el5

[Jens Petersen]

commit 15f754c2c2f4597203bc3aa7b9bebfb3a4828606
Merge: 2f452d3 791107e
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Aug 26 21:35:13 2014 +0900

    Merge remote-tracking branch 'origin' into el5

 .gitignore     |    2 ++
 cabal-rpm.spec |   28 ++++++++++++++++++++++++++--
 sources        |    2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)
---