[librepo/epel7: 2/2] Merge branch 'master' into epel7

[Tomas Mlcoch]

commit 5335d92ef98b9493b5487366f19b3d36df22bf3c
Merge: 15f4d88 63e4893
Author: Tomas Mlcoch <tmlcoch at redhat.com>
Date:   Wed Apr 23 12:39:33 2014 +0200

    Merge branch 'master' into epel7

 .gitignore   |    1 +
 librepo.spec |    8 ++++++--
 sources      |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---