[bodhi/el6: 14/14] Merge branch 'epel7' into el6

[Luke Macken]

commit 29d7024823859df998f0c6dcc8748cfba708f82b
Merge: 9113bac 5bde14f
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Feb 11 11:55:15 2014 -0700

    Merge branch 'epel7' into el6

 .gitignore |    8 ++++++
 bodhi.spec |   82 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 sources    |    2 +-
 3 files changed, 82 insertions(+), 10 deletions(-)
---